commit 1350be3c213d4f1aa4a1d84bd618003ea2ff3f1e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 09 23:25:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 23:25:54 2019 +0000
tree 8447ac19992cdc19e457b6707cd49e1fad5c214b
parent f66f6aefcca40098184afde493b52178af4d25c6
parent 4ff2a278a20821fc11e301cc1db555227c8eab02

Merge "Use Animator cancel instead of end" into ub-launcher3-qt-dev

go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java

diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
index 87ae695..c5e4b83 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -180,6 +180,7 @@
 
                     @Override
                     public void onAnimationEnd(Animator animation) {
+                        CONTENT_TRANSITION_PROGRESS.set(itemView, 1.0f);
                         dispatchChangeFinished(viewHolder, true /* oldItem */);
                         mRunningAnims.remove(anim);
                         dispatchFinishedWhenDone();
@@ -252,7 +253,8 @@
         }
         for (int i = mRunningAnims.size() - 1; i >= 0; i--) {
             ObjectAnimator anim = mRunningAnims.get(i);
-            anim.end();
+            // This calls the on end animation callback which will set values to their end target.
+            anim.cancel();
         }
         dispatchAnimationsFinished();
     }