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

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

Change Assistant shortcut to Meta+Space instead of Meta+A 

Bug: 442915856
Flag: EXEMPT config_only
Test: Presubmits
Change-Id: Ic72507fb40378edfe3c5ee67c045082ab78e6628
parent bd101d5b

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

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.keyboard.shortcut.data.source 
import android.content.res.Resources

import android.hardware.input.InputManager

import android.hardware.input.KeyGlyphMap

import android.view.KeyEvent.KEYCODE_A

import android.view.KeyEvent.KEYCODE_BACK

import android.view.KeyEvent.KEYCODE_DPAD_LEFT

import android.view.KeyEvent.KEYCODE_ESCAPE
@@ -32,6 +31,7 @@ import android.view.KeyEvent.KEYCODE_Q 
import android.view.KeyEvent.KEYCODE_RECENT_APPS

import android.view.KeyEvent.KEYCODE_S

import android.view.KeyEvent.KEYCODE_SLASH

import android.view.KeyEvent.KEYCODE_SPACE

import android.view.KeyEvent.KEYCODE_TAB

import android.view.KeyEvent.META_ALT_ON

import android.view.KeyEvent.META_CTRL_ON
@@ -230,9 +230,9 @@ constructor(@Main private val resources: Resources, private val inputManager: In 
                command(META_META_ON, KEYCODE_I)

            },

            // Access Assistant:

            //  - Meta + A

            //  - Meta + Space

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

                command(META_META_ON, KEYCODE_A)

                command(META_META_ON, KEYCODE_SPACE)

            },

        )

}

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ final class InputGestureManager { 
        // Initialize all system shortcuts

        List<InputGestureData> systemShortcuts = new ArrayList<>(List.of(

                createKeyGesture(

                        KeyEvent.KEYCODE_A,

                        KeyEvent.KEYCODE_SPACE,

                        KeyEvent.META_META_ON,

                        KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,

                        /* allowCaptureByFocusedWindow = */true

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

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ class KeyGestureControllerTests { 
                /* downTime= */ 0,

                /* eventTime= */ 0,

                KeyEvent.ACTION_DOWN,

                KeyEvent.KEYCODE_SPACE,

                KeyEvent.KEYCODE_MACRO_1, // Random valid keycode

                /* repeat= */ 0,

                KeyEvent.META_META_ON,

            )

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

+3 −3
Original line number Diff line number Diff line
@@ -377,10 +377,10 @@ object KeyGestureTestData { 
    val CAPTURABLE_SYSTEM_GESTURES =

        arrayOf(

            KeyGestureData(

                "META + A -> Launch Assistant",

                intArrayOf(KeyEvent.KEYCODE_META_LEFT, KeyEvent.KEYCODE_A),

                "META + Space -> Launch Assistant",

                intArrayOf(KeyEvent.KEYCODE_META_LEFT, KeyEvent.KEYCODE_SPACE),

                KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,

                intArrayOf(KeyEvent.KEYCODE_A),

                intArrayOf(KeyEvent.KEYCODE_SPACE),

                KeyEvent.META_META_ON,

                intArrayOf(KeyGestureEvent.ACTION_GESTURE_COMPLETE),

            ),