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

Commit c46b4785 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
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
parents 7cb0133d a5c6aad2

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.