Merge "[a11y] Fix Switch Access keyboard input issue in AA+." into main
diff --git a/src/com/android/launcher3/logging/KeyboardStateManager.java b/src/com/android/launcher3/logging/KeyboardStateManager.java
index d0f9c74..cd80608 100644
--- a/src/com/android/launcher3/logging/KeyboardStateManager.java
+++ b/src/com/android/launcher3/logging/KeyboardStateManager.java
@@ -28,6 +28,9 @@
// 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 @@
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 1d136c3..fcb7c28 100644
--- a/src/com/android/launcher3/views/AccessibilityActionsView.java
+++ b/src/com/android/launcher3/views/AccessibilityActionsView.java
@@ -79,6 +79,7 @@
}
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;
}