diff options
| author | Satoshi Kataoka <satok@android.com> | 2013-04-18 15:32:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-18 15:32:50 -0700 |
| commit | a1d7a123c40239178c2ca54b38fac9ea83e7ecc8 (patch) | |
| tree | 37a0e626b826bc128259d382b487ebb882d4c06f /services/java/com/android/server/InputMethodManagerService.java | |
| parent | 653dbd1f1c46f089fd1c18583a747c1066c66ad5 (diff) | |
| parent | f09993ca1d01823f9c60c0be45a8169e09dd27d7 (diff) | |
am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."
* commit 'f09993ca1d01823f9c60c0be45a8169e09dd27d7':
Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 8315ac4c9948..3baa565ece9b 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1498,7 +1498,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 |