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

Commit 4bfdc44d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LauncherTaskbarUIController should only translate nav buttons on... 

Merge "LauncherTaskbarUIController should only translate nav buttons on inAppProgresst if icon is aligned with hotseat" into tm-qpr-dev am: c46b4785

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



Change-Id: I318a1769220d5305f621d335de5aa657c4c89110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e80898c6 c46b4785

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

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
            return;

        }

        mTaskbarInAppDisplayProgress.put(progressIndex, progress);

        if (!mControllers.taskbarStashController.isInApp()

        if (mControllers.uiController.isIconAlignedWithHotseat()

                && !mTaskbarLauncherStateController.isAnimatingToLauncher()) {

            // Only animate the nav buttons while home and not animating home, otherwise let

            // the TaskbarViewController handle it.