From 5f14ec50dd3d5350ae345bb57492d7d052c4667e Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Fri, 22 Mar 2024 11:30:50 -0400
Subject: [PATCH] Focus the first task after the desktop task when launching
 overview from KQS

Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Flag: ACONFIG com.android.window.flags.enable_desktop_windowing_mode DEVELOPMENT
Fixes: 327420683
Test: opened overview using KQS
Change-Id: I9395ad6065844bf5f5007180cd8c3f80573ee473
---
 .../launcher3/taskbar/KeyboardQuickSwitchViewController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
index 5134f3bd51..8ff6e0a7cc 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
@@ -138,7 +138,7 @@ public class KeyboardQuickSwitchViewController {
         // views have been added in the KeyboardQuickSwitchView.
         GroupTask task = mControllerCallbacks.getTaskAt(index);
         if (task == null) {
-            return Math.max(0, index);
+            return mOnDesktop ? 1 : Math.max(0, index);
         }
         if (mControllerCallbacks.isTaskRunning(task)) {
             // Ignore attempts to run the selected task if it is already running.