From a77a8c3fa9d255b12723dc98fdbc9d5f4b00d3d7 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 11 Jan 2019 14:03:58 -0800 Subject: [PATCH] Fix bug where onStateTransitionEnd is not called when QUICKSTEP_SPRINGS=false. We ignore the value of mSpringEnded if springs are disabled. Bug: 122662526 Change-Id: I66ae98c8d8a4a52dabdf6f75c1fb6d1df0c45318 --- src/com/android/launcher3/anim/SpringObjectAnimator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/anim/SpringObjectAnimator.java b/src/com/android/launcher3/anim/SpringObjectAnimator.java index b2b931de0f..4f037efa6f 100644 --- a/src/com/android/launcher3/anim/SpringObjectAnimator.java +++ b/src/com/android/launcher3/anim/SpringObjectAnimator.java @@ -32,6 +32,8 @@ import androidx.dynamicanimation.animation.DynamicAnimation.OnAnimationEndListen import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; +import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; + /** * This animator allows for an object's property to be be controlled by an {@link ObjectAnimator} or * a {@link SpringAnimation}. It extends ValueAnimator so it can be used in an AnimatorSet. @@ -109,7 +111,8 @@ public class SpringObjectAnimator extends ValueAnimator { + mSpringEnded + ", mEnded=" + mEnded); } - if (mAnimatorEnded && mSpringEnded && !mEnded) { + // If springs are disabled, ignore value of mSpringEnded + if (mAnimatorEnded && (mSpringEnded || !QUICKSTEP_SPRINGS.get()) && !mEnded) { for (AnimatorListener l : mListeners) { l.onAnimationEnd(this); }