diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-10 01:42:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-10 01:42:47 +0000 |
| commit | fc65c357a1e396d3ee2b9b1a90f34011e12f1f6c (patch) | |
| tree | 5496ce6ccce6c520e2275e141cc4612f603d5414 /go | |
| parent | f574bd55353086c91553f3a071753afa0af06482 (diff) | |
| parent | 63517a7a0721a5b3c176f9a80a78a2e19827dd26 (diff) | |
| download | android_packages_apps_Trebuchet-fc65c357a1e396d3ee2b9b1a90f34011e12f1f6c.tar.gz android_packages_apps_Trebuchet-fc65c357a1e396d3ee2b9b1a90f34011e12f1f6c.tar.bz2 android_packages_apps_Trebuchet-fc65c357a1e396d3ee2b9b1a90f34011e12f1f6c.zip | |
Merge "Fix anim done callback not being called sometimes" into ub-launcher3-qt-dev
Diffstat (limited to 'go')
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java index 68cbd7a3a..808cd7217 100644 --- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java +++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java @@ -224,6 +224,9 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator { @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 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator { // This calls the on end animation callback which will set values to their end target. anim.cancel(); } - dispatchAnimationsFinished(); + dispatchFinishedWhenDone(); } private void endPendingAnimation(PendingAnimation pendAnim) { |