Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df4df460 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix SpringObjectAnimator not sending onAnimationEnd()" into ub-launcher3-master

parents e8d2ef6c cded01be

src/com/android/launcher3/anim/SpringObjectAnimator.java

+5 −5
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.launcher3.anim;



import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;
@@ -32,8 +34,6 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat; 
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.
@@ -51,9 +51,9 @@ public class SpringObjectAnimator<T extends ProgressInterface> extends ValueAnim 
    private SpringProperty<T> mProperty;



    private ArrayList<AnimatorListener> mListeners;

    private boolean mSpringEnded = false;

    private boolean mAnimatorEnded = false;

    private boolean mEnded = false;

    private boolean mSpringEnded = true;

    private boolean mAnimatorEnded = true;

    private boolean mEnded = true;



    private static final FloatPropertyCompat<ProgressInterface> sFloatProperty =

            new FloatPropertyCompat<ProgressInterface>("springObjectAnimator") {