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

Commit 010e3dfb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Consider TaskView's scale when calculating corner radius" into sc-v2-dev

parents f8eca200 bc42ba83

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

+2 −2
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 


        float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1);

        mCurrentFullscreenParams.setProgress(

                fullScreenProgress, recentsViewScale.value, mTaskRect.width(), mDp,

                mPositionHelper);

                fullScreenProgress, recentsViewScale.value, /*taskViewScale=*/1f, mTaskRect.width(),

                mDp, mPositionHelper);



        // Apply thumbnail matrix

        RectF insets = mCurrentFullscreenParams.mCurrentDrawnInsets;

quickstep/src/com/android/quickstep/views/TaskView.java

+4 −3
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ public class TaskView extends FrameLayout implements Reusable { 
        mCurrentFullscreenParams.setProgress(

                mFullscreenProgress,

                getRecentsView().getScaleX(),

                getScaleX(),

                getWidth(), mActivity.getDeviceProfile(),

                previewPositionHelper);

    }
@@ -1494,8 +1495,8 @@ public class TaskView extends FrameLayout implements Reusable { 
        /**

         * Sets the progress in range [0, 1]

         */

        public void setProgress(float fullscreenProgress, float parentScale, int previewWidth,

                DeviceProfile dp, PreviewPositionHelper pph) {

        public void setProgress(float fullscreenProgress, float parentScale, float taskViewScale,

                int previewWidth, DeviceProfile dp, PreviewPositionHelper pph) {

            RectF insets = pph.getInsetsToDrawInFullscreen();



            float currentInsetsLeft = insets.left * fullscreenProgress;
@@ -1506,7 +1507,7 @@ public class TaskView extends FrameLayout implements Reusable { 


            mCurrentDrawnCornerRadius =

                    Utilities.mapRange(fullscreenProgress, mCornerRadius, fullscreenCornerRadius)

                            / parentScale;

                            / parentScale / taskViewScale;



            // We scaled the thumbnail to fit the content (excluding insets) within task view width.

            // Now that we are drawing left/right insets again, we need to scale down to fit them.