nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add countryCode attribute to case tag of Keyboard"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-02-23 01:00:00 -08:00 committed by Android (Google) Code Review
commit edb722abef
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
java/res/values/attrs.xml
View file

@ -184,6 +184,7 @@
<flag name="actionPrevious" value="7" /> <flag name="actionPrevious" value="7" />
</attr> </attr>
<attr name="languageCode" format="string" /> <attr name="languageCode" format="string" />
<attr name="countryCode" format="string" />
</declare-styleable> </declare-styleable>
<declare-styleable name="Keyboard_KeyStyle"> <declare-styleable name="Keyboard_KeyStyle">

7
java/src/com/android/inputmethod/keyboard/KeyboardParser.java
View file

@ -437,11 +437,13 @@ public class KeyboardParser {
R.styleable.Keyboard_Case_imeAction, id.mImeAction); R.styleable.Keyboard_Case_imeAction, id.mImeAction);
final boolean languageCodeMatched = matchString(a, final boolean languageCodeMatched = matchString(a,
R.styleable.Keyboard_Case_languageCode, id.mLocale.getLanguage()); 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 final boolean selected = modeMatched && passwordInputMatched && settingsKeyMatched
&& voiceEnabledMatched && voiceKeyMatched && colorSchemeMatched && 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( textAttr(KeyboardId.modeName(
a.getInt(R.styleable.Keyboard_Case_mode, -1)), "mode"), a.getInt(R.styleable.Keyboard_Case_mode, -1)), "mode"),
textAttr(KeyboardId.colorSchemeName( textAttr(KeyboardId.colorSchemeName(
@ -453,6 +455,7 @@ public class KeyboardParser {
textAttr(KeyboardId.imeOptionsName( textAttr(KeyboardId.imeOptionsName(
a.getInt(R.styleable.Keyboard_Case_imeAction, -1)), "imeAction"), 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_languageCode), "languageCode"),
textAttr(a.getString(R.styleable.Keyboard_Case_countryCode), "countryCode"),
Boolean.toString(selected))); Boolean.toString(selected)));
return selected; return selected;