Merge "Let createSetStateAnimator return null when needed" into tm-qpr-dev (b42c293a) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+18 −8

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ValueAnimator;
		import android.annotation.Nullable;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.util.Log;
		@@ -45,6 +43,7 @@ import android.view.View;
		import android.view.ViewConfiguration;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.jank.InteractionJankMonitor;
		@@ -697,15 +696,26 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		}

		public void applyState(long duration) {
		createApplyStateAnimator(duration).start();
		Animator animator = createApplyStateAnimator(duration);
		if (animator != null) {
		animator.start();
		}
		}

		public void applyState(long duration, long startDelay) {
		Animator animator = createApplyStateAnimator(duration);
		if (animator != null) {
		animator.setStartDelay(startDelay);
		animator.start();
		}
		}


		/**
		* Returns an animator which applies the latest state if mIsStashed is changed, or {@code null}
		* otherwise.
		*/
		@Nullable
		public Animator createApplyStateAnimator(long duration) {
		return mStatePropertyHolder.createSetStateAnimator(mState, duration);
		}
		@@ -946,9 +956,9 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		* creating a new animation (stored in mAnimator).
		* @param flags The latest flags to apply (see the top of this file).
		* @param duration The length of the animation.
		* @return mAnimator if mIsStashed changed or an empty animator.
		* @return mAnimator if mIsStashed changed, or {@code null} otherwise.
		*/
		@NonNull
		@Nullable
		public Animator createSetStateAnimator(int flags, long duration) {
		int changedFlags = mPrevFlags ^ flags;
		if (mPrevFlags != flags) {
		@@ -977,7 +987,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		createAnimToIsStashed(mIsStashed, duration, /* animateBg= */ true, changedFlags);
		return mAnimator;
		}
		return ValueAnimator.ofFloat(0, 1).setDuration(duration);
		return null;
		}
		}
		}