diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index a089e7304c..849a7bcce4 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -296,9 +296,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { } float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1); - mCurrentFullscreenParams.setProgress( - fullScreenProgress, recentsViewScale.value, /*taskViewScale=*/1f, mTaskRect.width(), - mDp, mPositionHelper); + mCurrentFullscreenParams.setProgress(fullScreenProgress, recentsViewScale.value, + /* taskViewScale= */1f, mTaskRect.width(), mDp, mPositionHelper); // Apply thumbnail matrix RectF insets = mCurrentFullscreenParams.mCurrentDrawnInsets; diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 08b614a3c4..b650c952d5 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -1071,7 +1071,6 @@ public class TaskView extends FrameLayout implements Reusable { private void setNonGridScale(float nonGridScale) { mNonGridScale = nonGridScale; - updateCornerRadius(); applyScale(); } @@ -1102,6 +1101,7 @@ public class TaskView extends FrameLayout implements Reusable { scale *= mDismissScale; setScaleX(scale); setScaleY(scale); + updateSnapshotRadius(); } /** @@ -1417,29 +1417,25 @@ public class TaskView extends FrameLayout implements Reusable { mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE); mSnapshotView.getTaskOverlay().setFullscreenProgress(progress); - updateCornerRadius(); + updateSnapshotRadius(); - mSnapshotView.setFullscreenParams(mCurrentFullscreenParams); mOutlineProvider.updateParams( mCurrentFullscreenParams, mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx); invalidateOutline(); } - private void updateCornerRadius() { + private void updateSnapshotRadius() { updateCurrentFullscreenParams(mSnapshotView.getPreviewPositionHelper()); + mSnapshotView.setFullscreenParams(mCurrentFullscreenParams); } void updateCurrentFullscreenParams(PreviewPositionHelper previewPositionHelper) { if (getRecentsView() == null) { return; } - mCurrentFullscreenParams.setProgress( - mFullscreenProgress, - getRecentsView().getScaleX(), - mNonGridScale, - getWidth(), mActivity.getDeviceProfile(), - previewPositionHelper); + mCurrentFullscreenParams.setProgress(mFullscreenProgress, getRecentsView().getScaleX(), + getScaleX(), getWidth(), mActivity.getDeviceProfile(), previewPositionHelper); } /**