diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-01-30 13:56:55 -0800 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2019-01-30 13:56:55 -0800 |
| commit | aae3768c1a9818c77aeab2b2499743ed0b019006 (patch) | |
| tree | 8ca34589205cada7802fcc6d164b6a3abf4c4bec | |
| parent | 80748ae6f41b83596d6a38b6b9c82e050c5c9a7e (diff) | |
| download | android_packages_apps_Trebuchet-aae3768c1a9818c77aeab2b2499743ed0b019006.tar.gz android_packages_apps_Trebuchet-aae3768c1a9818c77aeab2b2499743ed0b019006.tar.bz2 android_packages_apps_Trebuchet-aae3768c1a9818c77aeab2b2499743ed0b019006.zip | |
Fix bug where listeners didn't get dispatched properly due to it being
attached to SpringObjectAnimator instead of the ObjectAnimator.
Bug: 123597926
Change-Id: Ife09e0e2bf4309b43be531e6e863692c75ae0867
| -rw-r--r-- | src/com/android/launcher3/anim/AnimatorPlaybackController.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/anim/SpringObjectAnimator.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/anim/AnimatorPlaybackController.java b/src/com/android/launcher3/anim/AnimatorPlaybackController.java index cf070c510..2c440bba1 100644 --- a/src/com/android/launcher3/anim/AnimatorPlaybackController.java +++ b/src/com/android/launcher3/anim/AnimatorPlaybackController.java @@ -236,7 +236,7 @@ public abstract class AnimatorPlaybackController implements ValueAnimator.Animat private void dispatchOnStartRecursively(Animator animator) { List<AnimatorListener> listeners = animator instanceof SpringObjectAnimator - ? nonNullList(((SpringObjectAnimator) animator).getSuperListeners()) + ? nonNullList(((SpringObjectAnimator) animator).getObjectAnimatorListeners()) : nonNullList(animator.getListeners()); for (AnimatorListener l : listeners) { diff --git a/src/com/android/launcher3/anim/SpringObjectAnimator.java b/src/com/android/launcher3/anim/SpringObjectAnimator.java index 4f45c051b..cc70e32ed 100644 --- a/src/com/android/launcher3/anim/SpringObjectAnimator.java +++ b/src/com/android/launcher3/anim/SpringObjectAnimator.java @@ -85,7 +85,7 @@ public class SpringObjectAnimator<T extends ProgressInterface> extends ValueAnim // We use this listener and track mListeners so that we can sync the animator and spring // listeners. - super.addListener(new AnimatorListenerAdapter() { + mObjectAnimator.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { mAnimatorEnded = false; @@ -157,8 +157,8 @@ public class SpringObjectAnimator<T extends ProgressInterface> extends ValueAnim mListeners.add(listener); } - public ArrayList<AnimatorListener> getSuperListeners() { - return super.getListeners(); + public ArrayList<AnimatorListener> getObjectAnimatorListeners() { + return mObjectAnimator.getListeners(); } @Override |