Let createSetStateAnimator return null when needed
- This is to fix a regression from http://ag/20968628. Instead of returning null and change the behavior, return null and do null checks on callers
Fix: 266109700
Test: Swipe AllApps from home on tablets, no flicker on taskbar, for gesture and 3-button
Change-Id: Ic1900ef396b00187ce9eced906c4628436481213
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
index 999db3b..a717136 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -35,8 +35,6 @@
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.ViewConfiguration;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.jank.InteractionJankMonitor;
@@ -697,15 +696,26 @@
}
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);
- animator.setStartDelay(startDelay);
- animator.start();
+ 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 @@
* 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 @@
createAnimToIsStashed(mIsStashed, duration, /* animateBg= */ true, changedFlags);
return mAnimator;
}
- return ValueAnimator.ofFloat(0, 1).setDuration(duration);
+ return null;
}
}
}