diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-02-23 01:00:00 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-02-23 01:00:00 -0800 |
| commit | edb722abefaa56708cd1d3ee617e35e5ed2f7f6a (patch) | |
| tree | 26fd8523c5d2e4afac16ca77f5f72b674c1a5f91 /java/src | |
| parent | 05a6c48d9c16c3c1fd51d7178628ed46163f21e2 (diff) | |
| parent | 912ade36d21b903353e7f106df49966d8494caa9 (diff) | |
| download | latinime-edb722abefaa56708cd1d3ee617e35e5ed2f7f6a.tar.gz latinime-edb722abefaa56708cd1d3ee617e35e5ed2f7f6a.tar.xz latinime-edb722abefaa56708cd1d3ee617e35e5ed2f7f6a.zip | |
Merge "Add countryCode attribute to case tag of Keyboard"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardParser.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardParser.java b/java/src/com/android/inputmethod/keyboard/KeyboardParser.java index df64ad5af..2632796dd 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardParser.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardParser.java @@ -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; |