drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Satoshi Kataoka
2012-11-17 21:53:02 -08:00
committed by Android (Google) Code Review
parent e007c0e8bc 15451bd7af
commit 2656abe098
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/InputMethodManagerService.java
View File

@ -2486,10 +2486,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
map.put(id, p); map.put(id, p);
// Valid system default IMEs and IMEs that have English subtypes are enabled // 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 // by default
// disabled if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p))) {
if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p))
&& (!haveHardKeyboard || disabledSysImes.indexOf(id) < 0)) {
setInputMethodEnabledLocked(id, true); setInputMethodEnabledLocked(id, true);
} }