Merge "[DO NOT MERGE] Fix some visual jumps when swiping home" into qt-qpr1-dev (4461347e) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -386,6 +386,10 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		// rounding at the end of the animation.
		float startRadius = mClipAnimationHelper.getCurrentCornerRadius();
		float endRadius = startRect.width() / 6f;

		float startTransformProgress = mTransformParams.getProgress();
		float endTransformProgress = 1;

		// We want the window alpha to be 0 once this threshold is met, so that the
		// FolderIconView can be seen morphing into the icon shape.
		final float windowAlphaThreshold = isFloatingIconView ? 1f - SHAPE_PROGRESS_DURATION : 1f;
		@@ -409,7 +413,8 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		public void onUpdate(RectF currentRect, float progress) {
		homeAnim.setPlayFraction(progress);

		mTransformParams.setProgress(progress)
		mTransformParams.setProgress(
		Utilities.mapRange(progress, startTransformProgress, endTransformProgress))
		.setCurrentRectAndTargetAlpha(currentRect, getWindowAlpha(progress));
		if (isFloatingIconView) {
		mTransformParams.setCornerRadius(endRadius * progress + startRadius

+4 −0

Original line number	Diff line number	Diff line
		@@ -402,6 +402,10 @@ public class ClipAnimationHelper {
		return this;
		}

		public float getProgress() {
		return progress;
		}

		public TransformParams setCornerRadius(float cornerRadius) {
		this.cornerRadius = cornerRadius;
		return this;