Merge "(1/n) Cleanup key gesture event refactoring flag" into main (51224c68) · Commits · e / os / android_frameworks_base

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

+2 −3

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.useKeyGestureEventHandler;
		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;
		@@ -1298,7 +1297,7 @@ public class InputSettings {
		* @hide
		*/
		public static boolean isCustomizableInputGesturesFeatureFlagEnabled() {
		return enableCustomizableInputGestures() && useKeyGestureEventHandler();
		return enableCustomizableInputGestures();
		}

		/**
		@@ -1307,6 +1306,6 @@ public class InputSettings {
		* @hide
		*/
		public static boolean doesKeyGestureEventHandlerSupportMultiKeyGestures() {
		return useKeyGestureEventHandler() && useKeyGestureEventHandlerMultiKeyGestures();
		return useKeyGestureEventHandlerMultiKeyGestures();
		}
		}

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -60,13 +60,6 @@ flag {
		bug: "358569822"
		}

		flag {
		namespace: "input_native"
		name: "use_key_gesture_event_handler"
		description: "Use KeyGestureEvent handler APIs to control system shortcuts and key gestures"
		bug: "358569822"
		}

		flag {
		namespace: "input"
		name: "use_key_gesture_event_handler_multi_key_gestures"

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMI
		import static android.window.DesktopModeFlags.ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS;

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

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -1027,7 +1026,7 @@ public abstract class WMShellModule {
		FocusTransitionObserver focusTransitionObserver,
		@ShellMainThread ShellExecutor mainExecutor,
		DisplayController displayController) {
		if (DesktopModeStatus.canEnterDesktopMode(context) && useKeyGestureEventHandler()
		if (DesktopModeStatus.canEnterDesktopMode(context)
		&& manageKeyGestures()
		&& (Flags.enableMoveToNextDisplayShortcut()
		\|\| DesktopModeFlags.ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS.isTrue())) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt

+4 −6

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import androidx.test.filters.SmallTest
		import com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer
		import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession
		import com.android.dx.mockito.inline.extended.StaticMockitoSession
		import com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER
		import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE
		import com.android.window.flags.Flags.FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS
		import com.android.window.flags.Flags.FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT
		@@ -152,7 +151,6 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
		@EnableFlags(
		FLAG_ENABLE_DISPLAY_FOCUS_IN_SHELL_TRANSITIONS,
		FLAG_ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT,
		FLAG_USE_KEY_GESTURE_EVENT_HANDLER,
		)
		fun keyGestureMoveToNextDisplay_shouldMoveToNextDisplay() {
		// Set up two display ids
		@@ -182,7 +180,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(FLAG_USE_KEY_GESTURE_EVENT_HANDLER, FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		@EnableFlags(FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		fun keyGestureSnapLeft_shouldSnapResizeTaskToLeft() {
		val task = setUpFreeformTask()
		task.isFocused = true
		@@ -208,7 +206,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(FLAG_USE_KEY_GESTURE_EVENT_HANDLER, FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		@EnableFlags(FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		fun keyGestureSnapRight_shouldSnapResizeTaskToRight() {
		val task = setUpFreeformTask()
		task.isFocused = true
		@@ -234,7 +232,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(FLAG_USE_KEY_GESTURE_EVENT_HANDLER, FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		@EnableFlags(FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		fun keyGestureToggleFreeformWindowSize_shouldToggleTaskSize() {
		val task = setUpFreeformTask()
		task.isFocused = true
		@@ -262,7 +260,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(FLAG_USE_KEY_GESTURE_EVENT_HANDLER, FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		@EnableFlags(FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS)
		fun keyGestureMinimizeFreeformWindow_shouldMinimizeTask() {
		val task = setUpFreeformTask()
		task.isFocused = true

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.hardware.input.Flags.FLAG_ENABLE_CUSTOMIZABLE_INPUT_GESTURES
		import com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.broadcast.broadcastDispatcher
		import com.android.systemui.coroutines.collectLastValue
		@@ -51,7 +50,7 @@ import org.mockito.kotlin.whenever

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@EnableFlags(FLAG_ENABLE_CUSTOMIZABLE_INPUT_GESTURES, FLAG_USE_KEY_GESTURE_EVENT_HANDLER)
		@EnableFlags(FLAG_ENABLE_CUSTOMIZABLE_INPUT_GESTURES)
		class CustomInputGesturesRepositoryTest : SysuiTestCase() {

		private val primaryUserContext: Context = mock()