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

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

@@ -180,6 +180,7 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator {
 
                     @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 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator {
         }
         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();
     }