Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01fcb728 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 37ee5342 8a802dbd

core/java/android/content/res/Configuration.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }

libs/androidfw/ResourceTypes.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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",

tools/aapt/AaptAssets.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;