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

Commit ff942d6d authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 3ab914cf: am 63c375d3: am 27b82632: Merge "Retain IME assignment if no... 

am 3ab914cf: am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev

* commit '3ab914cf':
  Retain IME assignment if no windows accept input.
parents 1e9863f0 3ab914cf

services/java/com/android/server/wm/WindowManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1232,10 +1232,10 @@ public class WindowManagerService extends IWindowManager.Stub 
        // the IME above it until it is completely gone so it doesn't drop

        // behind the dialog or its full-screen scrim.

        final WindowState curTarget = mInputMethodTarget;

        if (curTarget != null && w != null

        if (curTarget != null

                && curTarget.isDisplayedLw()

                && curTarget.isClosing()

                && (curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) {

                && (w == null || curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) {

            if (DEBUG_INPUT_METHOD) Slog.v(TAG, "Current target higher, not changing");

            return windows.indexOf(curTarget) + 1;

        }