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

Commit c72b18b7 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Decouple IME_ACTIVE and IME_VISIBLE for hardware keyboards." into klp-dev

parents 3e1a9eac 36439b43
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -879,8 +879,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
        final boolean isScreenSecurelyLocked =
                isScreenLocked && mKeyguardManager.isKeyguardSecure();
        final boolean inputShown = mInputShown && (!isScreenLocked || mInputBoundToKeyguard);
        mImeWindowVis = (!isScreenSecurelyLocked && (inputShown || hardKeyShown)) ?
                (InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE) : 0;
        final boolean inputActive = !isScreenSecurelyLocked && (inputShown || hardKeyShown);
        // We assume the softkeyboard is shown when the input is active as long as the
        // hard keyboard is not shown.
        final boolean inputVisible = inputActive && !hardKeyShown;
        mImeWindowVis = (inputActive ? InputMethodService.IME_ACTIVE : 0)
                | (inputVisible ? InputMethodService.IME_VISIBLE : 0);
        updateImeWindowStatusLocked();
    }