Revert "Fix bug where taskbar is translated during hotseat handoff."

This reverts commit ecb55ef471.

Bug: 277942460
Test: tablet/foldable device
      check taskbar animation b/w states and during drag

Change-Id: I48e37d58afa6e168a683e1b9c73ae15432920030
This commit is contained in:
Jon Miranda
2023-04-12 13:24:04 -07:00
parent ecb55ef471
commit fa8cc97e5f

View File

@@ -642,14 +642,8 @@ public class TaskbarLauncherStateController {
long resetDuration = mControllers.taskbarStashController.isInApp()
? duration
: duration / 2;
boolean shouldReset =
mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration);
boolean goingToLauncher = isAnimatingToLauncher();
boolean isNormalState = mLauncherState == LauncherState.NORMAL;
// Taskbar should always reset when animating to launcher in normal state to ensure there
// is no jump during the handoff to the hotseat.
if ((goingToLauncher && isNormalState)
|| (shouldReset && (goingToLauncher || isNormalState))) {
if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration)
&& (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) {
animatorSet.play(mControllers.taskbarTranslationController
.createAnimToResetTranslation(resetDuration));
}