Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a623260 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change screenshot shortcut to Meta + S" into main

parents eb1c80aa 2cee6fd5

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt

+2 −2
Original line number Diff line number Diff line
@@ -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 + /

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

+1 −1
Original line number Diff line number Diff line
@@ -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(

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java

+3 −3
Original line number Diff line number Diff line
@@ -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},

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

+2 −3
Original line number Diff line number Diff line
@@ -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(