Merge "Scale task's rounded corners in grid to match focused task." into sc-v2-dev (87f764ce) · Commits · e / os / BlissLauncher3

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;

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

+6 −10

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**