diff options
5 files changed, 9 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt index 5060abdda247..8bed8537b6c5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt @@ -155,9 +155,9 @@ constructor(@Main private val resources: Resources, private val inputManager: In command(META_META_ON, KEYCODE_DPAD_LEFT) }, // Take a full screenshot: - // - Meta + Ctrl + S + // - Meta + S shortcutInfo(resources.getString(R.string.group_system_full_screenshot)) { - command(META_META_ON or META_CTRL_ON, KEYCODE_S) + command(META_META_ON, KEYCODE_S) }, // Access list of system / apps shortcuts: // - Meta + / diff --git a/services/core/java/com/android/server/input/InputGestureManager.java b/services/core/java/com/android/server/input/InputGestureManager.java index 32b36bfb50e5..108afba7c52a 100644 --- a/services/core/java/com/android/server/input/InputGestureManager.java +++ b/services/core/java/com/android/server/input/InputGestureManager.java @@ -152,7 +152,7 @@ final class InputGestureManager { ), createKeyGesture( KeyEvent.KEYCODE_S, - KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON, + KeyEvent.META_META_ON, KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT ), createKeyGesture( diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 208331b08442..4860b7cdfcd3 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3664,7 +3664,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } break; case KeyEvent.KEYCODE_S: - if (firstDown && event.isMetaPressed() && event.isCtrlPressed()) { + if (firstDown && event.isMetaPressed()) { interceptScreenshotChord(SCREENSHOT_KEY_OTHER, 0 /*pressDelay*/); notifyKeyGestureCompleted(event, KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT); diff --git a/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java b/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java index 16c786b52655..c6b431ce0b18 100644 --- a/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java +++ b/services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java @@ -176,10 +176,10 @@ public class KeyGestureEventTests extends ShortcutKeyTestBase { KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_NOTIFICATION_PANEL, KeyEvent.KEYCODE_NOTIFICATION, 0}, - {"Meta + Ctrl + S -> Take Screenshot", - new int[]{META_KEY, CTRL_KEY, KeyEvent.KEYCODE_S}, + {"Meta + S -> Take Screenshot", + new int[]{META_KEY, KeyEvent.KEYCODE_S}, KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT, KeyEvent.KEYCODE_S, - META_ON | CTRL_ON}, + META_ON}, {"Meta + / -> Open Shortcut Helper", new int[]{META_KEY, KeyEvent.KEYCODE_SLASH}, KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_SHORTCUT_HELPER, KeyEvent.KEYCODE_SLASH, META_ON}, diff --git a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt index eef4e6f58463..36db955c3085 100644 --- a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt @@ -383,15 +383,14 @@ class KeyGestureControllerTests { intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE) ), TestData( - "META + CTRL + S -> Take Screenshot", + "META + S -> Take Screenshot", intArrayOf( KeyEvent.KEYCODE_META_LEFT, - KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.KEYCODE_S ), KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT, intArrayOf(KeyEvent.KEYCODE_S), - KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON, + KeyEvent.META_META_ON, intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE) ), TestData( |