Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c72b18b7: Merge "Decouple IME_ACTIVE and IME_VISIBLE for hardware keyboards." into klp-dev

Browse Source 
* commit 'c72b18b72eb75c2040bf686b06d52d79bdc7a24a':
  Decouple IME_ACTIVE and IME_VISIBLE for hardware keyboards.
This commit is contained in:
John Spurlock
2013-10-23 14:22:39 -07:00
committed by Android Git Automerger
parent 9390fcbbc6 c72b18b72e
commit c4f5868a41
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -879,8 +879,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final boolean isScreenSecurelyLocked =
isScreenLocked && mKeyguardManager.isKeyguardSecure();
final boolean inputShown = mInputShown && (!isScreenLocked || mInputBoundToKeyguard);
mImeWindowVis = (!isScreenSecurelyLocked && (inputShown || hardKeyShown)) ?
(InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE) : 0;
final boolean inputActive = !isScreenSecurelyLocked && (inputShown || hardKeyShown);
// We assume the softkeyboard is shown when the input is active as long as the
// hard keyboard is not shown.
final boolean inputVisible = inputActive && !hardKeyShown;
mImeWindowVis = (inputActive ? InputMethodService.IME_ACTIVE : 0)
| (inputVisible ? InputMethodService.IME_VISIBLE : 0);
updateImeWindowStatusLocked();
}