Merge "Allow user gesture to take priority over taskbar translation reset animnatiuon." into tm-qpr-dev

This commit is contained in:
Jon Miranda
2023-04-05 18:20:16 +00:00
committed by Android (Google) Code Review
2 changed files with 17 additions and 6 deletions

View File

@@ -642,7 +642,7 @@ public class TaskbarLauncherStateController {
long resetDuration = mControllers.taskbarStashController.isInApp()
? duration
: duration / 2;
if (!mControllers.taskbarTranslationController.willAnimateToZeroBefore(resetDuration)
if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration)
&& (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) {
animatorSet.play(mControllers.taskbarTranslationController
.createAnimToResetTranslation(resetDuration));