commit e4ce3662388ec4b78508681c145aa9d538a82a30
author Lucas Dupin <dupin@google.com> Wed Feb 06 15:16:24 2019 -0500
committer Lucas Dupin <dupin@google.com> Wed Feb 06 17:09:54 2019 -0500
tree 58749b635b4d27da558230e4051aec11aa5a6eca
parent 143e1c9553bee064a0610e8e9a43264a667a6240

Fix issue where animation progress would be overridden

Change-Id: I7ce6452a5cf412b74b404e8c3400b60660998f22
Fixes: 124001115
Test: visual

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

diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 0dee203..5515e97 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;
         }
 

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

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,