diff options
author | Jason Monk <jmonk@google.com> | 2014-05-02 17:04:10 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-05-07 09:51:58 -0400 |
commit | b605fecd9e4282823af754b3968b21205d64554a (patch) | |
tree | 219c8859230d703550fb69062ab6ab6f30132c8e /services/core/java/com/android/server/InputMethodManagerService.java | |
parent | 1e68fb3c3842bb90ed3f474cef0ddf7116eace0e (diff) | |
download | frameworks_base-b605fecd9e4282823af754b3968b21205d64554a.zip frameworks_base-b605fecd9e4282823af754b3968b21205d64554a.tar.gz frameworks_base-b605fecd9e4282823af754b3968b21205d64554a.tar.bz2 |
Only show IME in navigation bar when it should
Add a flag to indicate that the IME should be shown. This follows
the continuous ime notification boolean, and if there are multiple
input methods to choose from enabled. This way the notification
and navigation button show up under the same circumstances (but
not on the same devices).
Change-Id: Ia6a2253061f1876f4bcc511de48c1078e9d96be5
Diffstat (limited to 'services/core/java/com/android/server/InputMethodManagerService.java')
-rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 7ed1cc7..10315a7 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1532,14 +1532,17 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } mImeWindowVis = vis; mBackDisposition = backDisposition; - if (mStatusBar != null) { - mStatusBar.setImeWindowStatus(token, vis, backDisposition); - } final boolean iconVisibility = ((vis & (InputMethodService.IME_ACTIVE)) != 0) && (mWindowManagerService.isHardKeyboardAvailable() || (vis & (InputMethodService.IME_VISIBLE)) != 0); + final boolean needsToShowImeSwitcher = iconVisibility + && needsToShowImeSwitchOngoingNotification(); + if (mStatusBar != null) { + mStatusBar.setImeWindowStatus(token, vis, backDisposition, + needsToShowImeSwitcher); + } final InputMethodInfo imi = mMethodMap.get(mCurMethodId); - if (imi != null && iconVisibility && needsToShowImeSwitchOngoingNotification()) { + if (imi != null && needsToShowImeSwitcher) { // Used to load label final CharSequence title = mRes.getText( com.android.internal.R.string.select_input_method); |