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

Fix issue #2537384: Default keyboard input method switched

Browse Source 
on Eclaire to FRE77D upgrade

We want to prefer system IMEs when our current IME disappears.

Change-Id: Ief7332bc4f029991cd833ce0968d75bde987b594
This commit is contained in:
Dianne Hackborn
2010-03-23 23:03:25 -07:00
parent d0f11ea9fd
commit 83e48f57e9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1394,9 +1394,18 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
private boolean chooseNewDefaultIMELocked() {
List<InputMethodInfo> enabled = getEnabledInputMethodListLocked();
if (enabled != null && enabled.size() > 0) {
// We'd prefer to fall back on a system IME, since that is safer.
int i=enabled.size();
while (i > 0) {
i--;
if ((enabled.get(i).getServiceInfo().applicationInfo.flags
& ApplicationInfo.FLAG_SYSTEM) != 0) {
break;
}
}
Settings.Secure.putString(mContext.getContentResolver(),
Settings.Secure.DEFAULT_INPUT_METHOD,
enabled.get(0).getId());
enabled.get(i).getId());
return true;
}
@ -1435,7 +1444,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
// System IMEs are enabled by default
if (isSystemIme(p)) {
setInputMethodEnabled(p.getId(), true);
setInputMethodEnabledLocked(p.getId(), true);
}
if (DEBUG) {