Deprecate ACCESSIBILITY_ALL_APPS gesture type

Behavior for ALL_APPS and ACCESSIBILITY_ALL_APPS is exactly
the same so reducing the enum conflict.

Test: atest InputTests
Bug: 245989146
Flag: EXEMPT refactor
Change-Id: I729362351e7384f7119f1588f3f3be80e12df5fe

5 files changed, 6 insertions, 20 deletions

diff --git a/core/java/android/hardware/input/KeyGestureEvent.java b/core/java/android/hardware/input/KeyGestureEvent.java
index 9dd1fed4a85a..1249af7cc595 100644
--- a/core/java/android/hardware/input/KeyGestureEvent.java
+++ b/core/java/android/hardware/input/KeyGestureEvent.java
@@ -72,7 +72,8 @@ public final class KeyGestureEvent {
     public static final int KEY_GESTURE_TYPE_ALL_APPS = 21;
     public static final int KEY_GESTURE_TYPE_LAUNCH_SEARCH = 22;
     public static final int KEY_GESTURE_TYPE_LANGUAGE_SWITCH = 23;
-    public static final int KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS = 24;
+    @Deprecated
+    public static final int DEPRECATED_KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS = 24;
     public static final int KEY_GESTURE_TYPE_TOGGLE_CAPS_LOCK = 25;
     public static final int KEY_GESTURE_TYPE_SYSTEM_MUTE = 26;
     public static final int KEY_GESTURE_TYPE_SPLIT_SCREEN_NAVIGATION_LEFT = 27;
@@ -167,7 +168,6 @@ public final class KeyGestureEvent {
             KEY_GESTURE_TYPE_ALL_APPS,
             KEY_GESTURE_TYPE_LAUNCH_SEARCH,
             KEY_GESTURE_TYPE_LANGUAGE_SWITCH,
-            KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS,
             KEY_GESTURE_TYPE_TOGGLE_CAPS_LOCK,
             KEY_GESTURE_TYPE_SYSTEM_MUTE,
             KEY_GESTURE_TYPE_SPLIT_SCREEN_NAVIGATION_LEFT,
@@ -525,8 +525,6 @@ public final class KeyGestureEvent {
                 return FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__LAUNCH_SEARCH;
             case KEY_GESTURE_TYPE_LANGUAGE_SWITCH:
                 return FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__LANGUAGE_SWITCH;
-            case KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS:
-                return FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__ACCESSIBILITY_ALL_APPS;
             case KEY_GESTURE_TYPE_TOGGLE_CAPS_LOCK:
                 return FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__TOGGLE_CAPS_LOCK;
             case KEY_GESTURE_TYPE_SYSTEM_MUTE:
@@ -707,8 +705,6 @@ public final class KeyGestureEvent {
                 return "KEY_GESTURE_TYPE_LAUNCH_SEARCH";
             case KEY_GESTURE_TYPE_LANGUAGE_SWITCH:
                 return "KEY_GESTURE_TYPE_LANGUAGE_SWITCH";
-            case KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS:
-                return "KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS";
             case KEY_GESTURE_TYPE_TOGGLE_CAPS_LOCK:
                 return "KEY_GESTURE_TYPE_TOGGLE_CAPS_LOCK";
             case KEY_GESTURE_TYPE_SYSTEM_MUTE:
diff --git a/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt b/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt
index 0640351c8149..d9f9a3ea1032 100644
--- a/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt
@@ -121,16 +121,8 @@ constructor(
                     InputManager.KeyGestureEventListener { event ->
                         // Only store keyboard shortcut time for gestures providing keyboard
                         // education
-                        val shortcutType =
-                            when (event.keyGestureType) {
-                                KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS,
-                                KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS -> ALL_APPS
-
-                                else -> null
-                            }
-
-                        if (shortcutType != null) {
-                            trySendWithFailureLogging(shortcutType, TAG)
+                        if (event.keyGestureType == KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) {
+                            trySendWithFailureLogging(ALL_APPS, TAG)
                         }
                     }
 
diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java
index 5de432e5849b..b069a87480ad 100644
--- a/services/core/java/com/android/server/input/KeyGestureController.java
+++ b/services/core/java/com/android/server/input/KeyGestureController.java
@@ -762,7 +762,7 @@ final class KeyGestureController {
                         if (!canceled) {
                             handleKeyGesture(deviceId, new int[]{keyCode},
                                     /* modifierState = */0,
-                                    KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS,
+                                    KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS,
                                     KeyGestureEvent.ACTION_GESTURE_COMPLETE, displayId,
                                     focusedToken, /* flags = */0, /* appLaunchData = */null);
                         }
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index e8843ac214ec..d3aa0469435c 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4158,7 +4158,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 KeyGestureEvent.KEY_GESTURE_TYPE_BRIGHTNESS_DOWN,
                 KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER,
                 KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS,
-                KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS,
                 KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_SEARCH,
                 KeyGestureEvent.KEY_GESTURE_TYPE_LANGUAGE_SWITCH,
                 KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_SHORTCUT,
@@ -4311,7 +4310,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 }
                 break;
             case KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS:
-            case KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS:
                 if (complete && isKeyEventForCurrentUser(event.getDisplayId(),
                         event.getKeycodes()[0], "launchAllAppsViaA11y")) {
                     launchAllAppsAction();
diff --git a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt
index c64578e4638f..cdc4256a5fd4 100644
--- a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt
+++ b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt
@@ -980,7 +980,7 @@ class KeyGestureControllerTests {
             TestData(
                 "META -> Open Apps Drawer",
                 intArrayOf(KeyEvent.KEYCODE_META_LEFT),
-                KeyGestureEvent.KEY_GESTURE_TYPE_ACCESSIBILITY_ALL_APPS,
+                KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS,
                 intArrayOf(KeyEvent.KEYCODE_META_LEFT),
                 0,
                 intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE),