commit ec772f49950eed923b1f2c4033e6b7992375522c
author Jagrut Desai <jagrutdesai@google.com> Tue Jun 11 21:27:27 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 21:27:27 2024 +0000
tree 95027dbefe273f42817d61c9f5c343f32a60c87f
parent 16b2656ecfa9f3364695720b28174c8cf87f4d2e
parent 31a65a08dc3ec38ace426af91185a3b9ff59a106

Merge "Fix Taskbar All Apps Button to be Fixed in Minimal Taskbar State" into main

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index 23495ad..55745b5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -347,6 +347,11 @@
         float allAppIconTranslateRange = mapRange(scale, transientTaskbarAllAppsOffset,
                 persistentTaskbarAllAppsOffset);
 
+        // no x translation required when all apps button is the only icon in taskbar.
+        if (iconViews.length <= 1) {
+            allAppIconTranslateRange = 0f;
+        }
+
         if (mIsRtl) {
             allAppIconTranslateRange *= -1;
         }
@@ -377,7 +382,7 @@
                         -finalMarginScale * (iconIndex - halfIconCount));
             }
 
-            if (iconView.equals(mTaskbarView.getAllAppsButtonView()) && iconViews.length > 1) {
+            if (iconView.equals(mTaskbarView.getAllAppsButtonView())) {
                 ((IconButtonView) iconView).setTranslationXForTaskbarAllAppsIcon(
                         allAppIconTranslateRange);
             }