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

Commit e9177fae authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not set insets changed for invisible window" into tm-dev am: e79e811a am: 40b4671c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912001



Change-Id: I8afa7eae641679f5a752bd7ce434b7e46df81729
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af73fa1b 40b4671c

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

+3 −1
Original line number Diff line number Diff line
@@ -884,7 +884,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
     * {@link InsetsStateController#notifyInsetsChanged}.

     */

    boolean isReadyToDispatchInsetsState() {

        return isVisibleRequested() && mFrozenInsetsState == null;

        final boolean visible = shouldCheckTokenVisibleRequested()

                ? isVisibleRequested() : isVisible();

        return visible && mFrozenInsetsState == null;

    }



    void seamlesslyRotateIfAllowed(Transaction transaction, @Rotation int oldRotation,

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

+9 −0
Original line number Diff line number Diff line
@@ -927,6 +927,15 @@ public class WindowStateTests extends WindowTestsBase { 
        assertTrue(app.isReadyToDispatchInsetsState());

        mDisplayContent.getInsetsStateController().notifyInsetsChanged();

        verify(app).notifyInsetsChanged();



        // Verify that invisible non-activity window won't dispatch insets changed.

        final WindowState overlay = createWindow(null, TYPE_APPLICATION_OVERLAY, "overlay");

        makeWindowVisible(overlay);

        assertTrue(overlay.isReadyToDispatchInsetsState());

        overlay.mHasSurface = false;

        assertFalse(overlay.isReadyToDispatchInsetsState());

        mDisplayContent.getInsetsStateController().notifyInsetsChanged();

        assertFalse(overlay.getWindowFrames().hasInsetsChanged());

    }



    @UseTestDisplay(addWindows = {W_INPUT_METHOD, W_ACTIVITY})