diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-02-23 17:09:24 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-02-23 17:09:24 +0900 |
| commit | 912ade36d21b903353e7f106df49966d8494caa9 (patch) | |
| tree | dc0f328c61f327587b3867fb091cb7b546e6eabc /java/src | |
| parent | f5f834afcd5506a0ae3bd5bcfcb0c3a9b1506ac1 (diff) | |
| download | latinime-912ade36d21b903353e7f106df49966d8494caa9.tar.gz latinime-912ade36d21b903353e7f106df49966d8494caa9.tar.xz latinime-912ade36d21b903353e7f106df49966d8494caa9.zip | |
Add countryCode attribute to case tag of Keyboard
Change-Id: I0480c3350a335e4cb57bba2d3484622990cd90af
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; |