diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-30 21:35:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 21:35:45 +0000 |
| commit | fd955f14d6c87dffd1a20c36ad8001705495f831 (patch) | |
| tree | 19547f5a68684d963ba32fce10dc8b1a78d172dd /tools | |
| parent | cd50f7294654bf04195d9d1078a984ff9462093c (diff) | |
| parent | 6a6979ad17dfb492fb85a979e8f8688e4ed973b2 (diff) | |
| download | frameworks_base-fd955f14d6c87dffd1a20c36ad8001705495f831.zip frameworks_base-fd955f14d6c87dffd1a20c36ad8001705495f831.tar.gz frameworks_base-fd955f14d6c87dffd1a20c36ad8001705495f831.tar.bz2 | |
am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
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; |