diff options
author | satok <satok@google.com> | 2011-01-14 00:13:16 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-14 00:13:16 -0800 |
commit | 15572ff6e57a5e60d57f4e16c1e196d9203559d9 (patch) | |
tree | c77d84e05c50268f0479964b2b51372e75c092da /services | |
parent | 2421cd42292b3593716407847d2957f71c92c1fe (diff) | |
parent | ca83021e3555e8b2bd07ded7885dc44053cd1a25 (diff) | |
download | frameworks_base-15572ff6e57a5e60d57f4e16c1e196d9203559d9.zip frameworks_base-15572ff6e57a5e60d57f4e16c1e196d9203559d9.tar.gz frameworks_base-15572ff6e57a5e60d57f4e16c1e196d9203559d9.tar.bz2 |
Merge "Save input method subtype even if the current IME is not running." into honeycomb
Diffstat (limited to 'services')
-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. |