summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-09-07 10:17:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-07 10:17:55 -0700
commit01fcb728940c12498ab2c7503fe86a849725ea12 (patch)
tree95aaf7f4269fdd2d88ce2a7ca70374cf0be2b165 /libs
parent37ee53420ce47860807eb8eaeb454c12fa46797b (diff)
parent8a802dbdabdfd27692c2e38b2c3adafe95566106 (diff)
downloadframeworks_base-01fcb728940c12498ab2c7503fe86a849725ea12.zip
frameworks_base-01fcb728940c12498ab2c7503fe86a849725ea12.tar.gz
frameworks_base-01fcb728940c12498ab2c7503fe86a849725ea12.tar.bz2
Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/androidfw/ResourceTypes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 069dfa3..0107da4 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -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",