summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-01-30 01:14:02 +0900
committersatok <satok@google.com>2011-01-30 02:03:48 +0900
commite40dea0d06ec1c04db80191fd2965363b4fac781 (patch)
treeb788e2017fbf344487420af304d5415c08929e9a /services
parent19eecb028fe094e5f41d9ddeb1e6aac1d096da43 (diff)
downloadframeworks_base-e40dea0d06ec1c04db80191fd2965363b4fac781.zip
frameworks_base-e40dea0d06ec1c04db80191fd2965363b4fac781.tar.gz
frameworks_base-e40dea0d06ec1c04db80191fd2965363b4fac781.tar.bz2
Fix a bug that IME switch disappiers at switching IME subtype.
Bug: 3404788 Change-Id: I741642ac690a1b4c6ca1225ee271bffe39164170
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 8d6d3a1..877f559 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1053,7 +1053,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
if (mCurMethod != null) {
try {
- mImeWindowVis = 0;
+ final Configuration conf = mRes.getConfiguration();
+ final boolean haveHardKeyboard = conf.keyboard
+ != Configuration.KEYBOARD_NOKEYS;
+ final boolean hardKeyShown = haveHardKeyboard
+ && conf.hardKeyboardHidden != Configuration.KEYBOARDHIDDEN_YES;
+ mImeWindowVis = (mInputShown || hardKeyShown) ? (
+ InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE)
+ : 0;
mStatusBar.setImeWindowStatus(mCurToken, mImeWindowVis,
mBackDisposition);
// If subtype is null, try to find the most applicable one from