diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 7ff887c7d2..6279903392 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -245,7 +245,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private Animator mTaskbarBackgroundAlphaAnimator; private long mTaskbarBackgroundDuration; - private boolean mIsGoingHome; + private boolean mUserIsNotGoingHome = false; // Evaluate whether the handle should be stashed private final LongPredicate mIsStashedPredicate = flags -> { @@ -828,17 +828,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba private boolean mTaskbarBgAlphaAnimationStarted = false; @Override public void onAnimationUpdate(ValueAnimator valueAnimator) { - if (mIsGoingHome) { - mTaskbarBgAlphaAnimationStarted = true; - } if (mTaskbarBgAlphaAnimationStarted) { return; } if (valueAnimator.getAnimatedFraction() >= ANIMATED_FRACTION_THRESHOLD) { - if (!mIsGoingHome) { + if (mUserIsNotGoingHome) { playTaskbarBackgroundAlphaAnimation(); - setUserIsGoingHome(false); mTaskbarBgAlphaAnimationStarted = true; } } @@ -850,8 +846,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba /** * Sets whether the user is going home based on the current gesture. */ - public void setUserIsGoingHome(boolean isGoingHome) { - mIsGoingHome = isGoingHome; + public void setUserIsNotGoingHome(boolean userIsNotGoingHome) { + mUserIsNotGoingHome = userIsNotGoingHome; } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java index 593285f062..ce281c30e4 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java @@ -415,7 +415,7 @@ public class TaskbarUIController { /** * Sets whether the user is going home based on the current gesture. */ - public void setUserIsGoingHome(boolean isGoingHome) { - mControllers.taskbarStashController.setUserIsGoingHome(isGoingHome); + public void setUserIsNotGoingHome(boolean isNotGoingHome) { + mControllers.taskbarStashController.setUserIsNotGoingHome(isNotGoingHome); } } diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 1acafab217..93f72fc77c 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1196,7 +1196,7 @@ public abstract class AbsSwipeUpHandler