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

Commit 3761875b authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Ignore cropping taskbar for top app in split portrait" into tm-qpr-dev... 

Merge "Ignore cropping taskbar for top app in split portrait" into tm-qpr-dev am: d424d7a0 am: a1a624a3

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



Change-Id: I24ec0ba12149e3edc233e80cdcd4dfb9b3ced27f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents edae94b1 a1a624a3

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

+17 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class PreviewPositionHelper { 
    private boolean mIsOrientationChanged;

    private SplitBounds mSplitBounds;

    private int mDesiredStagePosition;

    private boolean mTaskbarInApp;



    public Matrix getMatrix() {

        return mMatrix;
@@ -57,6 +58,10 @@ public class PreviewPositionHelper { 
        mDesiredStagePosition = desiredStagePosition;

    }



    public void setTaskbarInApp(boolean taskbarInApp) {

        mTaskbarInApp = taskbarInApp;

    }



    /**

     * Updates the matrix based on the provided parameters

     */
@@ -83,8 +88,18 @@ public class PreviewPositionHelper { 
                        ? mSplitBounds.topTaskPercent

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

                // Scale portrait height to that of (actual screen - taskbar inset)

                fullscreenTaskHeight = (screenHeightPx - taskbarSize) * taskPercent;

                fullscreenTaskHeight = (screenHeightPx) * taskPercent;

                if (mTaskbarInApp) {

                    canvasScreenRatio = canvasHeight / fullscreenTaskHeight;

                } else {

                    if (mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT) {

                        // Top app isn't cropped at all by taskbar

                        canvasScreenRatio = 0;

                    } else {

                        // Same as fullscreen ratio

                        canvasScreenRatio = (float) canvasWidth / screenWidthPx;

                    }

                }

            } else {

                // For landscape, scale the width

                taskPercent = mDesiredStagePosition == STAGE_POSITION_TOP_OR_LEFT