From 38c0102aeffbfdfed6a3e75d367223818ef1e4ed Mon Sep 17 00:00:00 2001
From: Holly Sun <jiuyu@google.com>
Date: Mon, 6 Nov 2023 12:29:29 -0800
Subject: [PATCH] [a11y] Fix Switch Access keyboard input issue in AA+.

See https://buganizer.corp.google.com/issues/308704236#comment7. The issue is only reproducible when "Swipe up to start search" is OFF.

Video: https://drive.google.com/file/d/14ONBHL-qK3xaDWVruSMdQXWRGisyBSc2/view?usp=sharing

Bug: 308704236
Flag: NA
Test: manual
Change-Id: If84c1fcdb65add658022520018e34ad958be6bc2
---
 .../launcher3/logging/KeyboardStateManager.java     | 13 +++++++++++++
 .../launcher3/views/AccessibilityActionsView.java   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/src/com/android/launcher3/logging/KeyboardStateManager.java b/src/com/android/launcher3/logging/KeyboardStateManager.java
index d0f9c7431b..cd80608073 100644
--- a/src/com/android/launcher3/logging/KeyboardStateManager.java
+++ b/src/com/android/launcher3/logging/KeyboardStateManager.java
@@ -28,6 +28,9 @@ public class KeyboardStateManager {
     // Height of the keyboard when it's shown.
     // mImeShownHeightPx>=mImeHeightPx always.
     private int mImeShownHeightPx;
+    // Indicate if the latest All Apps session was started from a11y action (rather than a direct
+    // user interaction).
+    private boolean mLaunchedFromA11y;
 
     public enum KeyboardState {
         NO_IME_ACTION,
@@ -89,4 +92,14 @@ public class KeyboardStateManager {
             mImeShownHeightPx = mImeHeightPx;
         }
     }
+
+    /** Getter for {@code mLaunchedFromA11y} */
+    public boolean getLaunchedFromA11y() {
+        return mLaunchedFromA11y;
+    }
+
+    /** Setter for {@code mLaunchedFromA11y} */
+    public void setLaunchedFromA11y(boolean fromA11y) {
+        mLaunchedFromA11y = fromA11y;
+    }
 }
diff --git a/src/com/android/launcher3/views/AccessibilityActionsView.java b/src/com/android/launcher3/views/AccessibilityActionsView.java
index 1d136c3a9f..fcb7c282ee 100644
--- a/src/com/android/launcher3/views/AccessibilityActionsView.java
+++ b/src/com/android/launcher3/views/AccessibilityActionsView.java
@@ -79,6 +79,7 @@ public class AccessibilityActionsView extends View implements StateListener<Laun
         }
         Launcher l = Launcher.getLauncher(getContext());
         if (action == R.string.all_apps_button_label) {
+            l.getStatsLogManager().keyboardStateManager().setLaunchedFromA11y(true);
             l.getStateManager().goToState(ALL_APPS);
             return true;
         }