summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-09-05 13:12:02 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2012-09-06 11:13:24 -0700
commit8a802dbdabdfd27692c2e38b2c3adafe95566106 (patch)
tree7b933dc6d1dcfb6cd4a7d0a349ce642641712c07 /tools
parent18e876806718e28edaa3cd9bb0262a9b400bc82b (diff)
downloadframeworks_base-8a802dbdabdfd27692c2e38b2c3adafe95566106.zip
frameworks_base-8a802dbdabdfd27692c2e38b2c3adafe95566106.tar.gz
frameworks_base-8a802dbdabdfd27692c2e38b2c3adafe95566106.tar.bz2
Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
- we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3 codespace which uses 3 letters for identifying a language code (and could use either "rtl" or "ltr" strings for defining a language in the future). - we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers are defined by more than 3 chars and outside of what is defined into ISO-639. They are also more understandable as "ld" prefix is for "layoutdirection" Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/AaptAssets.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 438a670..5b71adc 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -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;