diff options
| author | 2025-01-30 16:23:03 -0800 | |
|---|---|---|
| committer | 2025-01-30 16:23:03 -0800 | |
| commit | 14f34ee8dbe1b33c3b6980b8d6dbcaa3813d5060 (patch) | |
| tree | 6e7f7385d261c12a69326a4c6224ad35713177b9 | |
| parent | 31719bf94d17f6efd44289609e6e9529bc0ee851 (diff) | |
| parent | 6ed26748b03acf265a120e2f96bd92f09043b9e2 (diff) | |
Merge "Make the FULLSCREEN key act like Ctrl+Action+Up." into main
| -rw-r--r-- | services/core/java/com/android/server/input/KeyGestureController.java | 2 | ||||
| -rw-r--r-- | tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java index fb5ce5b4e5fa..41f58ae76a4d 100644 --- a/services/core/java/com/android/server/input/KeyGestureController.java +++ b/services/core/java/com/android/server/input/KeyGestureController.java @@ -809,7 +809,7 @@ final class KeyGestureController { if (firstDown) { handleKeyGesture(deviceId, new int[]{KeyEvent.KEYCODE_FULLSCREEN}, /* modifierState = */0, - KeyGestureEvent.KEY_GESTURE_TYPE_MAXIMIZE_FREEFORM_WINDOW, + KeyGestureEvent.KEY_GESTURE_TYPE_MULTI_WINDOW_NAVIGATION, KeyGestureEvent.ACTION_GESTURE_COMPLETE, displayId, focusedToken, /* flags = */0, /* appLaunchData = */null); } diff --git a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt index 36db955c3085..37bdf6b8614d 100644 --- a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt @@ -1111,9 +1111,9 @@ class KeyGestureControllerTests { intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE) ), TestData( - "FULLSCREEN -> Maximizes a task to fit the screen", + "FULLSCREEN -> Turns a task into fullscreen", intArrayOf(KeyEvent.KEYCODE_FULLSCREEN), - KeyGestureEvent.KEY_GESTURE_TYPE_MAXIMIZE_FREEFORM_WINDOW, + KeyGestureEvent.KEY_GESTURE_TYPE_MULTI_WINDOW_NAVIGATION, intArrayOf(KeyEvent.KEYCODE_FULLSCREEN), 0, intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE) |