diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-09-07 10:17:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 10:17:55 -0700 |
| commit | 01fcb728940c12498ab2c7503fe86a849725ea12 (patch) | |
| tree | 95aaf7f4269fdd2d88ce2a7ca70374cf0be2b165 /tools | |
| parent | 37ee53420ce47860807eb8eaeb454c12fa46797b (diff) | |
| parent | 8a802dbdabdfd27692c2e38b2c3adafe95566106 (diff) | |
| download | frameworks_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 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 4 |
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; |