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

Commit 0b91a15f authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Perform layout when IME target changes" into rvc-dev

parents c2d3878b 62ea2cf5

services/core/java/com/android/server/wm/DisplayContent.java

+1 −1
Original line number Diff line number Diff line
@@ -3425,7 +3425,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


        mInputMethodTarget = target;

        mInputMethodTargetWaitingAnim = targetWaitingAnim;

        assignWindowLayers(false /* setLayoutNeeded */);

        assignWindowLayers(true /* setLayoutNeeded */);

        updateImeParent();

        updateImeControlTarget();

    }

services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ public class InsetsStateControllerTest extends WindowTestsBase { 
        // Adding FLAG_NOT_FOCUSABLE makes app above IME.

        app.mAttrs.flags |= FLAG_NOT_FOCUSABLE;

        mDisplayContent.computeImeTarget(true);

        mDisplayContent.setLayoutNeeded();

        mDisplayContent.applySurfaceChangesTransaction();



        // app won't get visible IME insets while above IME even when IME is visible.
@@ -204,7 +203,6 @@ public class InsetsStateControllerTest extends WindowTestsBase { 
        // Removing FLAG_NOT_FOCUSABLE makes app below IME.

        app.mAttrs.flags &= ~FLAG_NOT_FOCUSABLE;

        mDisplayContent.computeImeTarget(true);

        mDisplayContent.setLayoutNeeded();

        mDisplayContent.applySurfaceChangesTransaction();



        // Make sure app got notified.