Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2656abe098
@ -2486,10 +2486,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
|
||||
map.put(id, p);
|
||||
|
||||
// Valid system default IMEs and IMEs that have English subtypes are enabled
|
||||
// by default, unless there's a hard keyboard and the system IME was explicitly
|
||||
// disabled
|
||||
if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p))
|
||||
&& (!haveHardKeyboard || disabledSysImes.indexOf(id) < 0)) {
|
||||
// by default
|
||||
if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p))) {
|
||||
setInputMethodEnabledLocked(id, true);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user