diff options
| author | Satoshi Kataoka <satok@android.com> | 2013-04-18 15:28:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-18 15:28:18 -0700 |
| commit | f09993ca1d01823f9c60c0be45a8169e09dd27d7 (patch) | |
| tree | 454a039f4714769f4ce78f9e9d7d500591b6593a | |
| parent | 253bc7505c890d57466ce251369367ac384cff67 (diff) | |
| parent | 1a546dca77b47b86c87ddf4de7a76662ef8bd48b (diff) | |
| download | frameworks_base-f09993ca1d01823f9c60c0be45a8169e09dd27d7.zip frameworks_base-f09993ca1d01823f9c60c0be45a8169e09dd27d7.tar.gz frameworks_base-f09993ca1d01823f9c60c0be45a8169e09dd27d7.tar.bz2 | |
am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 2b15afd..4881d14 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -431,7 +431,7 @@ public class InputMethodService extends AbstractInputMethodService { } } // If user uses hard keyboard, IME button should always be shown. - boolean showing = onEvaluateInputViewShown(); + boolean showing = isInputViewShown(); mImm.setImeWindowStatus(mToken, IME_ACTIVE | (showing ? IME_VISIBLE : 0), mBackDisposition); if (resultReceiver != null) { diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index f872cc3..885fdae 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1493,7 +1493,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (mStatusBar != null) { mStatusBar.setImeWindowStatus(token, vis, backDisposition); } - final boolean iconVisibility = (vis & InputMethodService.IME_ACTIVE) != 0; + final boolean iconVisibility = ((vis & (InputMethodService.IME_ACTIVE)) != 0) + && (mWindowManagerService.isHardKeyboardAvailable() + || (vis & (InputMethodService.IME_VISIBLE)) != 0); final InputMethodInfo imi = mMethodMap.get(mCurMethodId); if (imi != null && iconVisibility && needsToShowImeSwitchOngoingNotification()) { // Used to load label |