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

Commit 0da3dce9 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: I5b6ff8bb9913fb43386c51fd47ae5e80e76541f2
parents 4f48862d dbd60cd6

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2110,7 +2110,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    private boolean shouldShowImeSwitcherLocked(int visibility) {

    private boolean shouldShowImeSwitcherLocked(int visibility) {

        if (!mShowOngoingImeSwitcherForPhones) return false;

        if (!mShowOngoingImeSwitcherForPhones) return false;

        if (mSwitchingDialog != null) 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 ((visibility & InputMethodService.IME_ACTIVE) == 0) return false;

        if (mWindowManagerInternal.isHardKeyboardAvailable()) {

        if (mWindowManagerInternal.isHardKeyboardAvailable()) {

            if (mHardKeyboardBehavior == HardKeyboardBehavior.WIRELESS_AFFORDANCE) {

            if (mHardKeyboardBehavior == HardKeyboardBehavior.WIRELESS_AFFORDANCE) {