Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8558ab authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

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

am: 0da3dce9

Change-Id: Ice71e70788d42c33271f9a3b1612fe142da9b561
parents 0e3927f0 0da3dce9

services/core/java/com/android/server/InputMethodManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {