Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."

Browse Source 
* commit '86315c452b955bf0b874f45c1a2e15aedda91a52':
  Fixes issue causing pseudolocalization of strings in non-translatable resource files.
This commit is contained in:
Elliott Hughes
2014-04-30 21:33:06 +00:00
committed by Android Git Automerger
parent 809c369892 86315c452b
commit 6a6979ad17
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt/ResourceTable.cpp
View File

@@ -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;