| commit | 2c32fd8433a1f019e22db5ba3094edd2a8c9ad17 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jan 05 16:41:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 05 16:41:34 2023 +0000 |
| tree | 8c06a904be583791f52b980bd19681e5f18ef37e | |
| parent | 1cbb2bec7d5d785d5d1ab95f0304233609e2d88e [diff] | |
| parent | 4bfdc44d2b5d255abf85e057de201bc23114090f [diff] |
Merge "LauncherTaskbarUIController should only translate nav buttons on inAppProgresst if icon is aligned with hotseat" into tm-qpr-dev am: c46b47853b am: 4bfdc44d2b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20838733 Change-Id: I58567030403e0528d62da152dc6b63fa6ebc9215 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 22f7f13..a18aabe 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -310,7 +310,7 @@ 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.