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

Commit dd730a17 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

Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d
parents b9c03e5c dbd60cd6

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

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