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 am: dbd60cd6ee

Browse Source 
am: 0da3dce9b4

Change-Id: Ice71e70788d42c33271f9a3b1612fe142da9b561
This commit is contained in:
Yohei Yukawa
2017-08-01 06:17:58 +00:00
committed by android-build-merger
parent 0e3927f01a 0da3dce9b4
commit ec8558abcd
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

@@ -2110,7 +2110,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) {