Merge "Deprecate ACCESSIBILITY_ALL_APPS gesture type" into main (a79d04c0) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/KeyGestureEvent.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -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:

packages/SystemUI/src/com/android/systemui/education/data/repository/UserContextualEducationRepository.kt

+2 −10

Original line number	Diff line number	Diff line
		@@ -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)
		}
		}

services/core/java/com/android/server/input/KeyGestureController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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();

tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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),