diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-09 23:25:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-09 23:25:54 +0000 |
| commit | 1350be3c213d4f1aa4a1d84bd618003ea2ff3f1e (patch) | |
| tree | 8447ac19992cdc19e457b6707cd49e1fad5c214b /go | |
| parent | f66f6aefcca40098184afde493b52178af4d25c6 (diff) | |
| parent | 4ff2a278a20821fc11e301cc1db555227c8eab02 (diff) | |
| download | android_packages_apps_Trebuchet-1350be3c213d4f1aa4a1d84bd618003ea2ff3f1e.tar.gz android_packages_apps_Trebuchet-1350be3c213d4f1aa4a1d84bd618003ea2ff3f1e.tar.bz2 android_packages_apps_Trebuchet-1350be3c213d4f1aa4a1d84bd618003ea2ff3f1e.zip | |
Merge "Use Animator cancel instead of end" into ub-launcher3-qt-dev
Diffstat (limited to 'go')
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java index 87ae6955e..c5e4b839f 100644 --- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java +++ b/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(); } |