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

am 01fcb728: Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev

Browse Source 
* commit '01fcb728940c12498ab2c7503fe86a849725ea12':
  Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
This commit is contained in:
Fabrice Di Meglio
2012-09-07 10:20:23 -07:00
committed by Android Git Automerger
parent e0bd3fe832 01fcb72894
commit c94106d7c9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/res/Configuration.java
View File

@@ -536,8 +536,8 @@ public final class Configuration implements Parcelable, Comparable<Configuration
int layoutDir = (screenLayout&SCREENLAYOUT_LAYOUTDIR_MASK);
switch (layoutDir) {
case SCREENLAYOUT_LAYOUTDIR_UNDEFINED: sb.append(" ?layoutDir"); break;
case SCREENLAYOUT_LAYOUTDIR_LTR: sb.append(" ltr"); break;
case SCREENLAYOUT_LAYOUTDIR_RTL: sb.append(" rtl"); break;
case SCREENLAYOUT_LAYOUTDIR_LTR: sb.append(" ldltr"); break;
case SCREENLAYOUT_LAYOUTDIR_RTL: sb.append(" ldrtl"); break;
default: sb.append(" layoutDir=");
sb.append(layoutDir >> SCREENLAYOUT_LAYOUTDIR_SHIFT); break;
}

4
libs/androidfw/ResourceTypes.cpp
View File

@@ -2061,10 +2061,10 @@ String8 ResTable_config::toString() const {
if (res.size() > 0) res.append("-");
switch (screenLayout&ResTable_config::MASK_LAYOUTDIR) {
case ResTable_config::LAYOUTDIR_LTR:
res.append("ltr");
res.append("ldltr");
break;
case ResTable_config::LAYOUTDIR_RTL:
res.append("rtl");
res.append("ldrtl");
break;
default:
res.appendFormat("layoutDir=%d",

4
tools/aapt/AaptAssets.cpp
View File

@@ -995,12 +995,12 @@ bool AaptGroupEntry::getLayoutDirectionName(const char* name, ResTable_config* o
(out->screenLayout&~ResTable_config::MASK_LAYOUTDIR)
| ResTable_config::LAYOUTDIR_ANY;
return true;
} else if (strcmp(name, "ltr") == 0) {
} else if (strcmp(name, "ldltr") == 0) {
if (out) out->screenLayout =
(out->screenLayout&~ResTable_config::MASK_LAYOUTDIR)
| ResTable_config::LAYOUTDIR_LTR;
return true;
} else if (strcmp(name, "rtl") == 0) {
} else if (strcmp(name, "ldrtl") == 0) {
if (out) out->screenLayout =
(out->screenLayout&~ResTable_config::MASK_LAYOUTDIR)
| ResTable_config::LAYOUTDIR_RTL;