From 5c6263afc5e37ab20cf65a959de0d4d70b2e87e0 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Tue, 13 Feb 2024 11:41:41 -0500
Subject: [PATCH] Fix alt-tab initial focus in overview on phones

Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Fixes: 325057678
Test: used alt+tab on a phone from home and from an app
Change-Id: I98388fea448fd1932d767c420e232d1451e0bbfe
---
 .../com/android/quickstep/OverviewCommandHelper.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index e448a14e1e..febfc3ad73 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -218,9 +218,13 @@ public class OverviewCommandHelper {
                     return true;
                 }
             }
-            if (cmd.type == TYPE_KEYBOARD_INPUT && allowQuickSwitch) {
-                uiController.openQuickSwitchView();
-                return true;
+            if (cmd.type == TYPE_KEYBOARD_INPUT) {
+                if (allowQuickSwitch) {
+                    uiController.openQuickSwitchView();
+                    return true;
+                } else {
+                    mKeyboardTaskFocusIndex = 0;
+                }
             }
             if (cmd.type == TYPE_HOME) {
                 ActiveGestureLog.INSTANCE.addLog("OverviewCommandHelper.executeCommand(TYPE_HOME)");