commit fc65c357a1e396d3ee2b9b1a90f34011e12f1f6c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 10 01:42:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 01:42:47 2019 +0000
tree 5496ce6ccce6c520e2275e141cc4612f603d5414
parent f574bd55353086c91553f3a071753afa0af06482
parent 63517a7a0721a5b3c176f9a80a78a2e19827dd26

Merge "Fix anim done callback not being called sometimes" 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 68cbd7a..808cd72 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -224,6 +224,9 @@
 
     @Override
     public void endAnimations() {
+        if (!isRunning()) {
+            return;
+        }
         for (int i = mPendingAnims.size() - 1; i >= 0; i--) {
             endPendingAnimation(mPendingAnims.get(i));
             mPendingAnims.remove(i);
@@ -233,7 +236,7 @@
             // This calls the on end animation callback which will set values to their end target.
             anim.cancel();
         }
-        dispatchAnimationsFinished();
+        dispatchFinishedWhenDone();
     }
 
     private void endPendingAnimation(PendingAnimation pendAnim) {