From 31a65a08dc3ec38ace426af91185a3b9ff59a106 Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Mon, 10 Jun 2024 13:08:15 -0700 Subject: [PATCH] Fix Taskbar All Apps Button to be Fixed in Minimal Taskbar State Test: Manual Bug: 346387672 Flag: NONE taskbar all apps is not behind a flag Change-Id: Iea63ccf57354a1e2941bd51f7f6f9e69187c4545 --- .../android/launcher3/taskbar/TaskbarViewController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 23495adcf7..55745b557a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -347,6 +347,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 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 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar -finalMarginScale * (iconIndex - halfIconCount)); } - if (iconView.equals(mTaskbarView.getAllAppsButtonView()) && iconViews.length > 1) { + if (iconView.equals(mTaskbarView.getAllAppsButtonView())) { ((IconButtonView) iconView).setTranslationXForTaskbarAllAppsIcon( allAppIconTranslateRange); }