diff options
| author | Robert Greenwalt <> | 2009-04-02 16:55:50 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 16:55:50 -0700 |
| commit | 4b4f4a908895bc0ba63f929bfdc02eec22c0f6e5 (patch) | |
| tree | 27ad907b6d1999c14bf04f4d2adb3c2b8ff85e90 /tools/aapt/ResourceTable.h | |
| parent | 2a3ce2825182aab7c6e555f69b77e2c3d42bd660 (diff) | |
AI 144342: Fix bag (string-array,etc) behavior with overlays.
We used to replace elements in the default with elements from
the overlay. This change causes us to empty the array first
so if the overlay array is smaller we don't end up with elements
from the default array showing through at the end of the array.
Ex: [A,B,C] and overlay [D] should give [D] but used to give
[D,B,C].
BUG=1754390
Automated import of CL 144342
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index e8fbd9b7b7c7..74ba326c2bf3 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -254,7 +254,9 @@ public: String16 getParent() const { return mParent; } status_t makeItABag(const SourcePos& sourcePos); - + + status_t emptyBag(const SourcePos& sourcePos); + status_t setItem(const SourcePos& pos, const String16& value, const Vector<StringPool::entry_style_span>* style = NULL, |