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

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

Merge "input: clean up bug report shortcut flag" into main

parents 6bee37da 3aba8530

services/core/java/com/android/server/flags/services.aconfig

+0 −10
Original line number Diff line number Diff line 
package: "com.android.server.flags"

container: "system"



flag {

    namespace: "input"

    name: "new_bugreport_keyboard_shortcut"

    description: "Enable META+CTRL+BACKSPACE keyboard shortcut for taking a bug report"

    bug: "335607520"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "backstage_power"

    name: "pkg_targeted_battery_changed_not_sticky"

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.hardware.input.InputGestureData.createKeyTrigger; 
import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGestures;

import static com.android.hardware.input.Flags.enableVoiceAccessKeyGestures;

import static com.android.hardware.input.Flags.keyboardA11yShortcutControl;

import static com.android.server.flags.Flags.newBugreportKeyboardShortcut;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -178,7 +177,7 @@ final class InputGestureManager { 
                        KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS

                )

        ));

        if (newBugreportKeyboardShortcut() && "1".equals(SystemProperties.get("ro.debuggable"))) {

        if ("1".equals(SystemProperties.get("ro.debuggable"))) {

            systemShortcuts.add(createKeyGesture(

                    KeyEvent.KEYCODE_DEL,

                    KeyEvent.META_META_ON | KeyEvent.META_CTRL_ON,

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

+0 −2
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ class KeyGestureControllerTests { 
    @Test

    @Parameters(method = "systemGesturesTestArguments")

    @EnableFlags(

        com.android.server.flags.Flags.FLAG_NEW_BUGREPORT_KEYBOARD_SHORTCUT,

        com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_SHORTCUT_CONTROL,

        com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_MOUSE_KEYS,

        com.android.hardware.input.Flags.FLAG_ENABLE_TALKBACK_AND_MAGNIFIER_KEY_GESTURES,
@@ -775,7 +774,6 @@ class KeyGestureControllerTests { 
    @Test

    @Parameters(method = "systemGesturesTestArguments")

    @EnableFlags(

        com.android.server.flags.Flags.FLAG_NEW_BUGREPORT_KEYBOARD_SHORTCUT,

        com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_SHORTCUT_CONTROL,

        com.android.hardware.input.Flags.FLAG_KEYBOARD_A11Y_MOUSE_KEYS,

        com.android.hardware.input.Flags.FLAG_ENABLE_TALKBACK_AND_MAGNIFIER_KEY_GESTURES,