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

Commit 691309c1 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge changes Ifc7b4ece,I27439d0f,I9ed8b899 into main 

* changes:
  (4/n) Cleanup manage_key_gestures permission flag
  (3/n) Cleanup multi key gesture event handling flags
  Shift ACCESSIBILITY_SHORTCUT handling to KeyGestureController
parents ae434d49 a10b86c1

core/java/android/hardware/input/IInputManager.aidl

+8 −8
Original line number Diff line number Diff line
@@ -260,42 +260,42 @@ interface IInputManager { 


    KeyGlyphMap getKeyGlyphMap(int deviceId);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    void registerKeyGestureEventListener(IKeyGestureEventListener listener);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    void unregisterKeyGestureEventListener(IKeyGestureEventListener listener);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    void registerKeyGestureHandler(in int[] keyGesturesToHandle, IKeyGestureHandler handler);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    void unregisterKeyGestureHandler(IKeyGestureHandler handler);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    AidlInputGestureData getInputGesture(int userId, in AidlInputGestureData.Trigger trigger);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    int addCustomInputGesture(int userId, in AidlInputGestureData data);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    int removeCustomInputGesture(int userId, in AidlInputGestureData data);



    @PermissionManuallyEnforced

    @EnforcePermission("MANAGE_KEY_GESTURES")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.MANAGE_KEY_GESTURES)")

    void removeAllCustomInputGestures(int userId, int tag);

core/java/android/hardware/input/InputSettings.java

+0 −10
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.hardware.input.Flags.pointerAcceleration; 
import static com.android.hardware.input.Flags.touchpadSystemGestureDisable;

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

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

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

import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;

import static com.android.input.flags.Flags.keyboardRepeatKeys;
@@ -1299,13 +1298,4 @@ public class InputSettings { 
    public static boolean isCustomizableInputGesturesFeatureFlagEnabled() {

        return enableCustomizableInputGestures();

    }



    /**

     * Whether multi-key gestures are supported using {@code KeyGestureEventHandler}

     *

     * @hide

     */

    public static boolean doesKeyGestureEventHandlerSupportMultiKeyGestures() {

        return useKeyGestureEventHandlerMultiKeyGestures();

    }

}

core/java/android/hardware/input/input_framework.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ flag { 
    bug: "358569822"

}



flag {

    namespace: "input"

    name: "use_key_gesture_event_handler_multi_key_gestures"

    description: "Use KeyGestureEvent handler APIs to control multi key press gestures"

    bug: "358569822"

}



flag {

    name: "keyboard_repeat_keys"

    namespace: "input_native"

core/res/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -8652,8 +8652,7 @@ 
         <p>Not for use by third-party applications.

         @hide -->

    <permission android:name="android.permission.MANAGE_KEY_GESTURES"

                android:protectionLevel="signature|recents"

                android:featureFlag="com.android.hardware.input.manage_key_gestures" />

                android:protectionLevel="signature|recents" />



    <!-- Allows applications to register listeners for key activeness through

         InputManagerService.

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+0 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_PO 
import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;

import static android.window.DesktopModeFlags.ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS;



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



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.IActivityTaskManager;
@@ -1050,7 +1048,6 @@ public abstract class WMShellModule { 
            DisplayController displayController,

            DesktopState desktopState) {

        if (desktopState.canEnterDesktopMode()

                && manageKeyGestures()

                && (Flags.enableMoveToNextDisplayShortcut()

                || DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue())) {

            return Optional.of(new DesktopModeKeyGestureHandler(context,