commit 1d82cfb1f07df7bfd66065e5f7fa3f8458f48c2d
author Lucas Dupin <dupin@google.com> Thu Feb 07 00:02:29 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 07 00:02:29 2019 +0000
tree 3d8e74f7b4daec8091fbd79693e8ddc145fe7af7
parent cff8024a083f2364467881821e19a8c5a955f361
parent e4ce3662388ec4b78508681c145aa9d538a82a30

Merge "Fix issue where animation progress would be overridden"

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,