Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa4d620 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Revert "Fix bug where taskbar is translated during hotseat handoff." 2p: fa8cc97e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22598537

Bug: 277942460
Change-Id: Ic7f1dc9e7c76e0028dd7d85729882bc277e5b50a
parents 351edbab fa8cc97e

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

+2 −8
Original line number Diff line number Diff line
@@ -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));

        }