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

Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev

Browse Source 
am: dbd60cd6ee

Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d
This commit is contained in:
Yohei Yukawa
2017-08-01 06:11:09 +00:00
committed by android-build-merger
parent b9c03e5c13 dbd60cd6ee
commit dd730a1796
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -2088,7 +2088,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
private boolean shouldShowImeSwitcherLocked(int visibility) {
if (!mShowOngoingImeSwitcherForPhones) return false;
if (mSwitchingDialog != null) return false;
if (isScreenLocked()) return false;
if (mWindowManagerInternal.isKeyguardShowingAndNotOccluded()
&& mKeyguardManager != null && mKeyguardManager.isKeyguardSecure()) return false;
if ((visibility & InputMethodService.IME_ACTIVE) == 0) return false;
if (mWindowManagerInternal.isHardKeyboardAvailable()) {
if (mHardKeyboardBehavior == HardKeyboardBehavior.WIRELESS_AFFORDANCE) {