Merge "Update condition for when to show letterbox" into tm-qpr-dev

    @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.

    }

    @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());

    }

        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();

        spyOn(mActivity.mLetterboxUiController);

        doReturn(true).when(mActivity.mLetterboxUiController)

                .isSurfaceReadyAndVisible(any());

                .isSurfaceVisible(any());

        assertTrue(mActivity.mLetterboxUiController.shouldShowLetterboxUi(

                mActivity.findMainWindow()));