diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-30 21:29:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-30 21:29:52 +0000 |
| commit | 86315c452b955bf0b874f45c1a2e15aedda91a52 (patch) | |
| tree | 36378884fa181cfc935a2f39a4281eaa4db6e0be | |
| parent | 54c3529b4d3f86488799caa0e62a1f3929a79a39 (diff) | |
| parent | 84410b054c7db0b6685a0f15cb2d1ffcb264f6c9 (diff) | |
| download | base-86315c452b955bf0b874f45c1a2e15aedda91a52.tar.gz | |
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
| -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 26b5bd6401e8..a8ef0a00beb0 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; |