diff options
| author | satok <satok@google.com> | 2011-05-30 12:37:52 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-05-30 22:44:48 +0900 |
| commit | 9b4157935af9e44571187a9533c2cc9b413383bf (patch) | |
| tree | c5a79afe893c246dbb37e05766857c7c069e9170 /services/java/com/android/server/InputMethodManagerService.java | |
| parent | 39a8dc4aaf6b8ff63b3168a8f7e3b8153d3891d8 (diff) | |
Use isAuxiliary instead of ExtraValue for the auxiliary subtypes.
Change-Id: Ibce4f884e697ca789b9942cf3abad43741040a87
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 465fd2e608dd..c96273b2c629 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -126,10 +126,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private static final String SUBTYPE_MODE_KEYBOARD = "keyboard"; private static final String SUBTYPE_MODE_VOICE = "voice"; - // TODO: Will formalize this value as API - private static final String SUBTYPE_EXTRAVALUE_EXCLUDE_FROM_LAST_IME = - "excludeFromLastInputMethod"; - final Context mContext; final Resources mRes; final Handler mHandler; @@ -1883,7 +1879,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub final int subtypeCount = imi.getSubtypeCount(); for (int j = 0; j < subtypeCount; ++j) { InputMethodSubtype subtype = imi.getSubtypeAt(j); - if (enabledSubtypeSet.contains(String.valueOf(subtype.hashCode()))) { + if (enabledSubtypeSet.contains(String.valueOf(subtype.hashCode())) + && !subtype.isAuxiliary()) { final CharSequence title; int nameResId = subtype.getNameResId(); String mode = subtype.getMode(); @@ -2078,7 +2075,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private boolean canAddToLastInputMethod(InputMethodSubtype subtype) { if (subtype == null) return true; - return !subtype.containsExtraValueKey(SUBTYPE_EXTRAVALUE_EXCLUDE_FROM_LAST_IME); + return !subtype.isAuxiliary(); } private void saveCurrentInputMethodAndSubtypeToHistory() { |