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

Skip resource files for locales en-XA and ar-XB

Browse Source 
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.

Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
This commit is contained in:
Igor Viarheichyk
2014-05-01 17:04:39 -07:00
parent 83a538e40e
commit 47843df11f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt/ResourceTable.cpp
View File

@@ -865,6 +865,21 @@ status_t compileResourceFile(Bundle* bundle,
pseudoBidiParams.country[0] = 'X';
pseudoBidiParams.country[1] = 'B';
// We should skip resources for pseudolocales if they were
// already added automatically. This is a fix for a transition period when
// manually pseudolocalized resources may be expected.
// TODO: remove this check after next SDK version release.
if ((bundle->getPseudolocalize() & PSEUDO_ACCENTED &&
curParams.locale == pseudoParams.locale) ||
(bundle->getPseudolocalize() & PSEUDO_BIDI &&
curParams.locale == pseudoBidiParams.locale)) {
SourcePos(in->getPrintableSource(), 0).warning(
"Resource file %s is skipped as pseudolocalization"
" was done automatically.",
in->getPrintableSource().string());
return NO_ERROR;
}
while ((code=block.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {
if (code == ResXMLTree::START_TAG) {
const String16* curTag = NULL;