diff options
| author | Igor Viarheichyk <viarheichyk@google.com> | 2014-04-30 11:56:42 -0700 |
|---|---|---|
| committer | Igor Viarheichyk <viarheichyk@google.com> | 2014-04-30 11:56:42 -0700 |
| commit | 84410b054c7db0b6685a0f15cb2d1ffcb264f6c9 (patch) | |
| tree | e75b6010cd7a2eb70025fe4db1c2b90b798b13ee /tools | |
| parent | 56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07 (diff) | |
| download | frameworks_base-84410b054c7db0b6685a0f15cb2d1ffcb264f6c9.zip frameworks_base-84410b054c7db0b6685a0f15cb2d1ffcb264f6c9.tar.gz frameworks_base-84410b054c7db0b6685a0f15cb2d1ffcb264f6c9.tar.bz2 | |
Fixes issue causing pseudolocalization of strings
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 26b5bd6..a8ef0a0 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -1340,7 +1340,6 @@ status_t compileResourceFile(Bundle* bundle, name, locale, SourcePos(in->getPrintableSource(), block.getLineNumber())); - curIsPseudolocalizable = fileIsTranslatable; } if (formatted == false16) { @@ -1352,7 +1351,7 @@ status_t compileResourceFile(Bundle* bundle, curType = string16; curFormat = ResTable_map::TYPE_REFERENCE|ResTable_map::TYPE_STRING; curIsStyled = true; - curIsPseudolocalizable = (translatable != false16); + curIsPseudolocalizable = fileIsTranslatable && (translatable != false16); } else if (strcmp16(block.getElementName(&len), drawable16.string()) == 0) { curTag = &drawable16; curType = drawable16; |