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

Commit 1b165f94 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Reset fullscreen task clipping" into tm-qpr-dev am: 164d2fe7 

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



Change-Id: I68b6920460529fe0e6ed0acf1b7b3626087999b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c715710 164d2fe7

packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/PreviewPositionHelper.java

+13 −12
Original line number Diff line number Diff line
@@ -71,14 +71,20 @@ public class PreviewPositionHelper { 
        int deltaRotate = getRotationDelta(currentRotation, thumbnailRotation);

        RectF thumbnailClipHint = new RectF();



        float scaledTaskbarSize = 0;

        float scaledTaskbarSize;

        float canvasScreenRatio;

        if (mSplitBounds != null) {

            float fullscreenTaskWidth;

            float fullscreenTaskHeight;

            float canvasScreenRatio;



            float taskPercent;

            if (!mSplitBounds.appsStackedVertically) {

            if (mSplitBounds.appsStackedVertically) {

                taskPercent = mDesiredStagePosition != STAGE_POSITION_TOP_OR_LEFT

                        ? mSplitBounds.topTaskPercent

                        : (1 - (mSplitBounds.topTaskPercent + mSplitBounds.dividerHeightPercent));

                fullscreenTaskHeight = screenHeightPx * taskPercent;

                canvasScreenRatio = canvasHeight / fullscreenTaskHeight;

            } else {

                // For landscape, scale the width

                taskPercent = mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT

                        ? mSplitBounds.leftTaskPercent
@@ -86,17 +92,12 @@ public class PreviewPositionHelper { 
                // Scale landscape width to that of actual screen

                fullscreenTaskWidth = screenWidthPx * taskPercent;

                canvasScreenRatio = canvasWidth / fullscreenTaskWidth;

            }

        } else {

                taskPercent = mDesiredStagePosition != STAGE_POSITION_TOP_OR_LEFT

                        ? mSplitBounds.leftTaskPercent

                        : (1 - (mSplitBounds.leftTaskPercent + mSplitBounds.dividerWidthPercent));

                // Scale landscape width to that of actual screen

                fullscreenTaskHeight = screenHeightPx * taskPercent;

                canvasScreenRatio = canvasHeight / fullscreenTaskHeight;

            canvasScreenRatio = (float) canvasWidth / screenWidthPx;

        }

        scaledTaskbarSize = taskbarSize * canvasScreenRatio;

        thumbnailClipHint.bottom = isTablet ? scaledTaskbarSize : 0;

        }



        float scale = thumbnailData.scale;

        final float thumbnailScale;