Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c2fff23 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing... 

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

* commit 'fd955f14':
  Fixes issue causing pseudolocalization of strings in non-translatable resource files.
parents 5e2901ba fd955f14

tools/aapt/ResourceTable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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;