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

Commit e73ab594 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Layer input method on top while transitioning." into pi-dev am: e47deaca

am: 4d7b702a

Change-Id: Ifedb1ff82143dfc4ed70f3ca6b4d4a86c0ed4b26
parents b4fe1776 4d7b702a
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -3807,9 +3807,15 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
        // we use relative layering of the IME targets child windows, and place the
        // IME in the non-app layer (see {@link AboveAppWindowContainers#assignChildLayers}).
        //
        // In the case the IME target is animating, the animation Z order may be different
        // than the WindowContainer Z order, so it's difficult to be sure we have the correct
        // IME target. In this case we just layer the IME over all transitions by placing it in the
        // above applications layer.
        //
        // In the case where we have no IME target we assign it where it's base layer would
        // place it in the AboveAppWindowContainers.
        if (imeTarget != null && !imeTarget.inSplitScreenWindowingMode()
        if (imeTarget != null && !(imeTarget.inSplitScreenWindowingMode()
                || imeTarget.mToken.isAppAnimating())
                && (imeTarget.getSurfaceControl() != null)) {
            mImeWindowsContainers.assignRelativeLayer(t, imeTarget.getSurfaceControl(),
                    // TODO: We need to use an extra level on the app surface to ensure