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

Commit 87550ffe authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Attemp to fix letterbox flicker before app window draw." into main

parents b43e44ee b54fcdfc

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

+2 −7
Original line number Diff line number Diff line
@@ -1308,7 +1308,8 @@ final class LetterboxUiController { 
        }



        final boolean shouldShowLetterboxUi =

                (mActivityRecord.isInLetterboxAnimation() || isSurfaceVisible(mainWindow))

                (mActivityRecord.isInLetterboxAnimation() || mActivityRecord.isVisible()

                        || mActivityRecord.isVisibleRequested())

                && mainWindow.areAppWindowBoundsLetterboxed()

                // Check for FLAG_SHOW_WALLPAPER explicitly instead of using

                // WindowContainer#showWallpaper because the later will return true when this
@@ -1320,12 +1321,6 @@ final class LetterboxUiController { 
        return shouldShowLetterboxUi;

    }



    @VisibleForTesting

    boolean isSurfaceVisible(WindowState mainWindow) {

        return mainWindow.isOnScreen() && (mActivityRecord.isVisible()

                || mActivityRecord.isVisibleRequested());

    }



    private Color getLetterboxBackgroundColor() {

        final WindowState w = mActivityRecord.findMainWindow();

        if (w == null || w.isLetterboxedForDisplayCutout()) {

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

+2 −1
Original line number Diff line number Diff line
@@ -643,7 +643,8 @@ public class LetterboxUiControllerTest extends WindowTestsBase { 
        doReturn(false).when(mActivity).isInLetterboxAnimation();

        assertEquals(expectedRadius, mController.getRoundedCornersRadius(mainWindow));



        doReturn(false).when(mainWindow).isOnScreen();

        doReturn(false).when(mActivity).isVisibleRequested();

        doReturn(false).when(mActivity).isVisible();

        assertEquals(0, mController.getRoundedCornersRadius(mainWindow));



        doReturn(true).when(mActivity).isInLetterboxAnimation();

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

+1 −2
Original line number Diff line number Diff line
@@ -915,8 +915,7 @@ public class SizeCompatTests extends WindowTestsBase { 
        assertEquals(window, mActivity.findMainWindow());



        spyOn(mActivity.mLetterboxUiController);

        doReturn(true).when(mActivity.mLetterboxUiController)

                .isSurfaceVisible(any());

        doReturn(true).when(mActivity).isVisibleRequested();



        assertTrue(mActivity.mLetterboxUiController.shouldShowLetterboxUi(

                mActivity.findMainWindow()));