commit 6965fdd12ad979474083bf3e79f937c0eb20bdf6
author Jagrut Desai <jagrutdesai@google.com> Fri Oct 13 11:21:32 2023 -0700
committer Jagrut Desai <jagrutdesai@google.com> Fri Oct 13 12:49:18 2023 -0700
tree 31d8911c6bafcea21623a074bd66b9aa00721200
parent a96537fa652945242cf9367662472111daadad46

Always use Transient Taskbar All apps icon for taskbar pinning

Test: Manual, Visual
Bug: 265436799
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I253f3b7f6b0c1d198ba7c9849e99f6cf4b89a006

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 3dc30dc..1ff2804 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -19,6 +19,7 @@
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
 
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_SEARCH_IN_TASKBAR;
+import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_PINNING;
 import static com.android.launcher3.config.FeatureFlags.enableCursorHoverStates;
 import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
@@ -172,12 +173,14 @@
 
     @DrawableRes
     private int getAllAppsButton(boolean isTransientTaskbar) {
+        boolean shouldSelectTransientIcon = (isTransientTaskbar || ENABLE_TASKBAR_PINNING.get())
+                && !mActivityContext.isThreeButtonNav();
         if (ENABLE_ALL_APPS_SEARCH_IN_TASKBAR.get()) {
-            return isTransientTaskbar
+            return shouldSelectTransientIcon
                     ? R.drawable.ic_transient_taskbar_all_apps_search_button
                     : R.drawable.ic_taskbar_all_apps_search_button;
         } else {
-            return isTransientTaskbar
+            return shouldSelectTransientIcon
                     ? R.drawable.ic_transient_taskbar_all_apps_button
                     : R.drawable.ic_taskbar_all_apps_button;
         }