| commit | 1ea481ad8389cda0845d6e88d0cb4570eff03ef1 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Wed Feb 06 15:16:24 2019 -0500 |
| committer | Lucas Dupin <dupin@google.com> | Wed Feb 06 22:21:53 2019 +0000 |
| tree | 0c29dd1817b8ff655f0ff033fecfe9d1ad15af03 | |
| parent | 2fe83ec92927e756aa9dc18f417aa0343a4eb975 [diff] |
Fix issue where animation progress would be overridden Change-Id: I7ce6452a5cf412b74b404e8c3400b60660998f22 Fixes: 124001115 Test: visual
diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java index 57400bd..720c1c4 100644 --- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -390,7 +390,6 @@ public TransformParams setCurrentRectAndTargetAlpha(RectF currentRect, float targetAlpha) { this.currentRect = currentRect; this.targetAlpha = targetAlpha; - this.progress = 1; return this; }
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index ff85003..5c8f53c 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -222,7 +222,8 @@ mTempRect.top -= offsetY; } mTempRectF.set(mTempRect); - mTransformParams.setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha()) + mTransformParams.setProgress(1f) + .setCurrentRectAndTargetAlpha(mTempRectF, taskView.getAlpha()) .setSyncTransactionApplier(mSyncTransactionApplier); if (mRecentsAnimationWrapper.targetSet != null) { mClipAnimationHelper.applyTransform(mRecentsAnimationWrapper.targetSet,