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

Commit e7b69414 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Remove non-functional NOTES shortcut 

We will rely on ROLE_NOTES based bookmark to launch notes app
instead of dedicated system shortcut. With the shortcut
currently broken, we are removing the shortcut from system
shortcut logic.

Once ROLE_NOTES is available and added to default application
supported roles, we can add corresponding bookmark to the list
of app bookmarks (bookmarks.xml) and it should work.

Test: atest KeyGestureControllerTests
Test: atest KeyGestureEventTests
Bug: 390707077
Flag: EXEMPT bugfix
Change-Id: I9ff3509e0b04ec8127b6a6dcefd64ae7e5e2848d
parent c906bd55

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

+0 −2
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ object TestShortcuts { 
            simpleShortcutCategory(System, "System apps", "Open settings"),

            simpleShortcutCategory(System, "System controls", "Lock screen"),

            simpleShortcutCategory(System, "System controls", "View notifications"),

            simpleShortcutCategory(System, "System apps", "Take a note"),

            simpleShortcutCategory(System, "System controls", "Take screenshot"),

            simpleShortcutCategory(System, "System controls", "Go back"),

            simpleShortcutCategory(MultiTasking, "Split screen", "Switch to full screen"),
@@ -570,7 +569,6 @@ object TestShortcuts { 
            simpleInputGestureData(

                keyGestureType = KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_NOTIFICATION_PANEL

            ),

            simpleInputGestureData(keyGestureType = KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_NOTES),

            simpleInputGestureData(

                keyGestureType = KeyGestureEvent.KEY_GESTURE_TYPE_TAKE_SCREENSHOT

            ),

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/InputGestureMaps.kt

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_LOCK_SCREEN 
import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_MINIMIZE_FREEFORM_WINDOW

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_MOVE_TO_NEXT_DISPLAY

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_MULTI_WINDOW_NAVIGATION

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_NOTES

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_SHORTCUT_HELPER

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS

import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER
@@ -67,7 +66,6 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
            KEY_GESTURE_TYPE_OPEN_SHORTCUT_HELPER to System,

            KEY_GESTURE_TYPE_TOGGLE_NOTIFICATION_PANEL to System,

            KEY_GESTURE_TYPE_LOCK_SCREEN to System,

            KEY_GESTURE_TYPE_OPEN_NOTES to System,

            KEY_GESTURE_TYPE_LAUNCH_SYSTEM_SETTINGS to System,

            KEY_GESTURE_TYPE_LAUNCH_ASSISTANT to System,

            KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT to System,
@@ -113,7 +111,6 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
                R.string.shortcut_helper_category_system_controls,

            KEY_GESTURE_TYPE_LOCK_SCREEN to R.string.shortcut_helper_category_system_controls,

            KEY_GESTURE_TYPE_ALL_APPS to R.string.shortcut_helper_category_system_controls,

            KEY_GESTURE_TYPE_OPEN_NOTES to R.string.shortcut_helper_category_system_apps,

            KEY_GESTURE_TYPE_LAUNCH_SYSTEM_SETTINGS to

                R.string.shortcut_helper_category_system_apps,

            KEY_GESTURE_TYPE_LAUNCH_ASSISTANT to R.string.shortcut_helper_category_system_apps,
@@ -173,7 +170,6 @@ class InputGestureMaps @Inject constructor(private val context: Context) { 
                R.string.group_system_access_notification_shade,

            KEY_GESTURE_TYPE_LOCK_SCREEN to R.string.group_system_lock_screen,

            KEY_GESTURE_TYPE_ALL_APPS to R.string.group_system_access_all_apps_search,

            KEY_GESTURE_TYPE_OPEN_NOTES to R.string.group_system_quick_memo,

            KEY_GESTURE_TYPE_LAUNCH_SYSTEM_SETTINGS to R.string.group_system_access_system_settings,

            KEY_GESTURE_TYPE_LAUNCH_ASSISTANT to R.string.group_system_access_google_assistant,

            KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT to

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

+0 −5
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ constructor(@Main private val resources: Resources, private val inputManager: In 


    private fun systemAppsShortcuts() =

        listOf(

            // Pull up Notes app for quick memo:

            //  - Meta + Ctrl + N

            shortcutInfo(resources.getString(R.string.group_system_quick_memo)) {

                command(META_META_ON or META_CTRL_ON, KEYCODE_N)

            },

            // Access system settings:

            //  - Meta + I

            shortcutInfo(resources.getString(R.string.group_system_access_system_settings)) {

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java

+0 −7
Original line number Diff line number Diff line
@@ -607,13 +607,6 @@ public final class KeyboardShortcutListSearch { 
                        context.getString(R.string.group_system_lock_screen),

                        Arrays.asList(

                                Pair.create(KeyEvent.KEYCODE_L, KeyEvent.META_META_ON))),

                /* Pull up Notes app for quick memo: Meta + Ctrl + N */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_quick_memo),

                        Arrays.asList(

                                Pair.create(

                                        KeyEvent.KEYCODE_N,

                                        KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON))),

                /* Access system settings: Meta + I */

                new ShortcutKeyGroupMultiMappingInfo(

                        context.getString(R.string.group_system_access_system_settings),

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

+0 −5
Original line number Diff line number Diff line
@@ -145,11 +145,6 @@ final class InputGestureManager { 
                        KeyEvent.META_META_ON,

                        KeyGestureEvent.KEY_GESTURE_TYPE_TOGGLE_NOTIFICATION_PANEL

                ),

                createKeyGesture(

                        KeyEvent.KEYCODE_N,

                        KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON,

                        KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_NOTES

                ),

                createKeyGesture(

                        KeyEvent.KEYCODE_S,

                        KeyEvent.META_META_ON,