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

Commit 1c14416a authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Shift to "input" namespace for multi key gesture refactor 

Bug: 358569822
Test: manual
Flag: com.android.hardware.input.use_key_gesture_event_handler_multi_key_gestures
Change-Id: Idd7be32f2d60d3694623c4c201c1f63109522fee
parent 5f837195

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import static com.android.hardware.input.Flags.touchpadTapDragging; 
import static com.android.hardware.input.Flags.touchpadThreeFingerTapShortcut;

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

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

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

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.enableInputFilterRustImpl;

import static com.android.input.flags.Flags.keyboardRepeatKeys;
@@ -1155,6 +1155,6 @@ public class InputSettings { 
     * @hide

     */

    public static boolean doesKeyGestureEventHandlerSupportMultiKeyGestures() {

        return useKeyGestureEventHandler() && useKeyGestureEventHandlerMultiPressGestures();

        return useKeyGestureEventHandler() && useKeyGestureEventHandlerMultiKeyGestures();

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ flag { 
}



flag {

    namespace: "input_native"

    name: "use_key_gesture_event_handler_multi_press_gestures"

    namespace: "input"

    name: "use_key_gesture_event_handler_multi_key_gestures"

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

    bug: "358569822"

}

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith; 
 */

@MediumTest

@RunWith(AndroidJUnit4.class)

@DisableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER_MULTI_PRESS_GESTURES)

@DisableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER_MULTI_KEY_GESTURES)

public class CombinationKeyTests extends ShortcutKeyTestBase {

    private static final long A11Y_KEY_HOLD_MILLIS = 3500;

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

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ class KeyGestureControllerTests { 
    @Parameters(method = "systemGesturesTestArguments_forKeyCombinations")

    @EnableFlags(

        com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER,

        com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER_MULTI_PRESS_GESTURES

        com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER_MULTI_KEY_GESTURES

    )

    fun testKeyCombinationGestures(test: TestData) {

        setupKeyGestureController()