diff options
| author | satok <satok@google.com> | 2011-01-13 21:15:04 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-01-14 17:06:53 +0900 |
| commit | ca83021e3555e8b2bd07ded7885dc44053cd1a25 (patch) | |
| tree | 4f9638203e602115459f634572a3171d50ad0e50 /services/java/com | |
| parent | 96100195f06d9be287f2577a41f498917b34f7ef (diff) | |
| download | frameworks_base-ca83021e3555e8b2bd07ded7885dc44053cd1a25.zip frameworks_base-ca83021e3555e8b2bd07ded7885dc44053cd1a25.tar.gz frameworks_base-ca83021e3555e8b2bd07ded7885dc44053cd1a25.tar.bz2 | |
Save input method subtype even if the current IME is not running.
Bug: 3325103
Change-Id: I6dfd19a0d494526cdb4cfb4230a5376ce94ca94a
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index a2684fb..5b56082 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -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. |