Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Save input method subtype even if the current IME is not running." into honeycomb

Browse Source
This commit is contained in:
satok
2011-01-14 00:13:16 -08:00
committed by Android (Google) Code Review
parent 2421cd4229 ca83021e35
commit 15572ff6e5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,6 +427,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
// Uh oh, current input method is no longer around!
// Pick another one...
Slog.i(TAG, "Current input method removed: " + curInputMethodId);
mStatusBar.setIMEButtonVisible(mCurToken, false);
if (!chooseNewDefaultIMELocked()) {
changed = true;
curIm = null;
@@ -1020,9 +1021,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
if (subtype != mCurrentSubtype) {
synchronized (mMethodMap) {
if (subtype != null) {
setSelectedInputMethodAndSubtypeLocked(info, subtypeId, true);
}
if (mCurMethod != null) {
try {
setSelectedInputMethodAndSubtypeLocked(info, subtypeId, true);
if (mInputShown) {
// If mInputShown is false, there is no IME button on the
// system bar.