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

Commit 6b5b274b authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Update condition for when to show letterbox" into tm-qpr-dev am: 69d2637f am: 6514372b 

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



Change-Id: Iaad2aafac39bbb7052d5fea08e6cc787033483f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87f8414a 6514372b

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

+3 −6
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ final class LetterboxUiController { 


    @VisibleForTesting

    boolean shouldShowLetterboxUi(WindowState mainWindow) {

        return isSurfaceReadyAndVisible(mainWindow) && mainWindow.areAppWindowBoundsLetterboxed()

        return isSurfaceVisible(mainWindow) && mainWindow.areAppWindowBoundsLetterboxed()

                // Check for FLAG_SHOW_WALLPAPER explicitly instead of using

                // WindowContainer#showWallpaper because the later will return true when this

                // activity is using blurred wallpaper for letterbox background.
@@ -1008,11 +1008,8 @@ final class LetterboxUiController { 
    }



    @VisibleForTesting

    boolean isSurfaceReadyAndVisible(WindowState mainWindow) {

        boolean surfaceReady = mainWindow.isDrawn() // Regular case

                // Waiting for relayoutWindow to call preserveSurface

                || mainWindow.isDragResizeChanged();

        return surfaceReady && (mActivityRecord.isVisible()

    boolean isSurfaceVisible(WindowState mainWindow) {

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

                || mActivityRecord.isVisibleRequested());

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ public class LetterboxUiControllerTest extends WindowTestsBase { 
        doReturn(insets).when(mainWindow).getInsetsState();

        doReturn(attrs).when(mainWindow).getAttrs();

        doReturn(true).when(mainWindow).isDrawn();

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

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

        doReturn(true).when(mainWindow).areAppWindowBoundsLetterboxed();

        doReturn(true).when(mLetterboxConfiguration).isLetterboxActivityCornersRounded();

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

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ public class SizeCompatTests extends WindowTestsBase { 


        spyOn(mActivity.mLetterboxUiController);

        doReturn(true).when(mActivity.mLetterboxUiController)

                .isSurfaceReadyAndVisible(any());

                .isSurfaceVisible(any());



        assertTrue(mActivity.mLetterboxUiController.shouldShowLetterboxUi(

                mActivity.findMainWindow()));