From: Fabrice Di Meglio Date: Wed, 5 Sep 2012 20:12:02 +0000 (-0700) Subject: Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/dc63f4cb0300891ac5f05cf119a3648dc2ff5d1e 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 --- diff --git a/AaptAssets.cpp b/AaptAssets.cpp index 438a670..5b71adc 100644 --- a/AaptAssets.cpp +++ b/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;