Merge "Keep rounded corners during activity transitions" into tm-qpr-dev am:...

    @VisibleForTesting

    boolean shouldShowLetterboxUi(WindowState mainWindow) {

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

        return (mActivityRecord.isInLetterboxAnimation() || 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.

    // for all corners for consistency and pick a minimal bottom one for consistency with a

    // taskbar rounded corners.

    int getRoundedCornersRadius(final WindowState mainWindow) {

        if (!requiresRoundedCorners(mainWindow) || mActivityRecord.isInLetterboxAnimation()) {

        if (!requiresRoundedCorners(mainWindow)) {

            return 0;

        }

        mainWindow.mInvGlobalScale = invGlobalScale;

        mLetterboxConfiguration.setLetterboxActivityCornersRadius(configurationRadius);

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

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

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

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

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

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

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

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

    }

    @Test

            insets.addSource(taskbar);

        }

        doReturn(mLetterboxedPortraitTaskBounds).when(mActivity).getBounds();

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

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

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

        doReturn(insets).when(mainWindow).getInsetsState();