diff --git a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java index 3d8563ee3e5..4c1fcd9f4c2 100644 --- a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java +++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java @@ -109,8 +109,9 @@ public class InputMethodSettingValuesWrapper { } public boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context) { + final boolean isEnabled = isEnabledImi(imi); synchronized (mMethodMap) { - if (mSettings.getEnabledInputMethodListLocked().size() <= 1) { + if (mSettings.getEnabledInputMethodListLocked().size() <= 1 && isEnabled) { return true; } } @@ -121,7 +122,7 @@ public class InputMethodSettingValuesWrapper { return false; } - if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabledImi(imi)) { + if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabled) { return false; }