commit 84410b054c7db0b6685a0f15cb2d1ffcb264f6c9
author Igor Viarheichyk <viarheichyk@google.com> Wed Apr 30 11:56:42 2014 -0700
committer Igor Viarheichyk <viarheichyk@google.com> Wed Apr 30 11:56:42 2014 -0700
tree e75b6010cd7a2eb70025fe4db1c2b90b798b13ee
parent 56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07

Fixes issue causing pseudolocalization of strings
in non-translatable resource files.

Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376

tools/aapt/ResourceTable.cpp

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 @@
                                 name,
                                 locale,
                                 SourcePos(in->getPrintableSource(), block.getLineNumber()));
-                        curIsPseudolocalizable = fileIsTranslatable;
                     }
 
                     if (formatted == false16) {
@@ -1352,7 +1351,7 @@
                 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;