Fix ime settings

Bug: 8364845
Change-Id: I1c9b30fa64682b905ef32c10bda0c9f93e8be975
This commit is contained in:
Satoshi Kataoka
2013-08-02 20:52:12 +09:00
parent c6fc8e46f2
commit d3e8bed913

View File

@@ -109,8 +109,9 @@ public class InputMethodSettingValuesWrapper {
} }
public boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context) { public boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context) {
final boolean isEnabled = isEnabledImi(imi);
synchronized (mMethodMap) { synchronized (mMethodMap) {
if (mSettings.getEnabledInputMethodListLocked().size() <= 1) { if (mSettings.getEnabledInputMethodListLocked().size() <= 1 && isEnabled) {
return true; return true;
} }
} }
@@ -121,7 +122,7 @@ public class InputMethodSettingValuesWrapper {
return false; return false;
} }
if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabledImi(imi)) { if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabled) {
return false; return false;
} }