commit 500698152c20e4765585e83f7ff21fb23751d7d4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 21 11:41:55 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 21 11:41:55 2025 -0700
tree 35405024dcbafc3767a76b6258e46b0b8d6d32e3
parent cfe62a68d23a3c88c28f593dfe76c08823120d54
parent c2cb80434f856dafa68702c3dc464c8fc57406d0

Merge "Hide scroll arrows from Alt+Tab UI" into main

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
index ab147bb..515cfe2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
@@ -47,7 +47,6 @@
 
 import com.android.app.animation.Interpolators;
 import com.android.internal.jank.Cuj;
-import com.android.launcher3.Flags;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatedFloat;
@@ -180,17 +179,6 @@
 
         mIsRtl = Utilities.isRtl(resources);
 
-        if (Flags.taskbarOverflow()) {
-            initializeScrollArrows();
-
-            if (mIsRtl) {
-                mStartScrollArrow.setContentDescription(
-                        resources.getString(R.string.quick_switch_scroll_arrow_right));
-                mEndScrollArrow.setContentDescription(
-                        resources.getString(R.string.quick_switch_scroll_arrow_left));
-            }
-        }
-
         TypefaceUtils.setTypeface(
                 mNoRecentItemsPane.findViewById(R.id.no_recent_items_text),
                 FontFamily.GSF_LABEL_LARGE);
@@ -359,9 +347,21 @@
                 });
     }
 
-    private void initializeScrollArrows() {
+
+    void enableScrollArrowSupport() {
+        if (mSupportsScrollArrows) {
+            return;
+        }
         mSupportsScrollArrows = true;
 
+        if (mIsRtl) {
+            mStartScrollArrow.setContentDescription(
+                    getResources().getString(R.string.quick_switch_scroll_arrow_right));
+            mEndScrollArrow.setContentDescription(
+                    getResources().getString(R.string.quick_switch_scroll_arrow_left));
+        }
+
+
         mStartScrollArrow.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
index b5f2532..a312d5f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
@@ -34,6 +34,7 @@
 
 import com.android.internal.jank.Cuj;
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.Flags;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorListeners;
@@ -119,6 +120,10 @@
         mWasDesktopTaskFilteredOut = wasDesktopTaskFilteredOut;
         mWasOpenedFromTaskbar = wasOpenedFromTaskbar;
 
+        if (Flags.taskbarOverflow() && wasOpenedFromTaskbar) {
+            mKeyboardQuickSwitchView.enableScrollArrowSupport();
+        }
+
         mKeyboardQuickSwitchView.applyLoadPlan(
                 mOverlayContext,
                 tasks,