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

Commit 912ade36 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add countryCode attribute to case tag of Keyboard 

Change-Id: I0480c3350a335e4cb57bba2d3484622990cd90af
parent f5f834af

java/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
            <flag name="actionPrevious" value="7" />

        </attr>

        <attr name="languageCode" format="string" />

        <attr name="countryCode" format="string" />

    </declare-styleable>



    <declare-styleable name="Keyboard_KeyStyle">

java/src/com/android/inputmethod/keyboard/KeyboardParser.java

+5 −2
Original line number Diff line number Diff line
@@ -437,11 +437,13 @@ public class KeyboardParser { 
                    R.styleable.Keyboard_Case_imeAction, id.mImeAction);

            final boolean languageCodeMatched = matchString(a,

                    R.styleable.Keyboard_Case_languageCode, id.mLocale.getLanguage());

            final boolean countryCodeMatched = matchString(a,

                    R.styleable.Keyboard_Case_countryCode, id.mLocale.getCountry());

            final boolean selected = modeMatched && passwordInputMatched && settingsKeyMatched

                    && voiceEnabledMatched && voiceKeyMatched && colorSchemeMatched

                    && imeActionMatched && languageCodeMatched;

                    && imeActionMatched && languageCodeMatched && countryCodeMatched;



            if (DEBUG) Log.d(TAG, String.format("<%s%s%s%s%s%s%s%s%s> %s", TAG_CASE,

            if (DEBUG) Log.d(TAG, String.format("<%s%s%s%s%s%s%s%s%s%s> %s", TAG_CASE,

                    textAttr(KeyboardId.modeName(

                            a.getInt(R.styleable.Keyboard_Case_mode, -1)), "mode"),

                    textAttr(KeyboardId.colorSchemeName(
@@ -453,6 +455,7 @@ public class KeyboardParser { 
                    textAttr(KeyboardId.imeOptionsName(

                            a.getInt(R.styleable.Keyboard_Case_imeAction, -1)), "imeAction"),

                    textAttr(a.getString(R.styleable.Keyboard_Case_languageCode), "languageCode"),

                    textAttr(a.getString(R.styleable.Keyboard_Case_countryCode), "countryCode"),

                    Boolean.toString(selected)));



            return selected;