From 84cde92450a3fea8ac9f2dbf98c59fe43dd3ec79 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Thu, 1 May 2025 09:51:34 +0000 Subject: [PATCH] Use grantManageKeyGesturesToRecents flag for granting recents key gesture events Reason: Recents app can only listen to key gesture events after ag/33295605, which is gated by a read only flag, com.android.window.flags.grant_manage_key_gestures_to_recents. Test: atest NexusLauncherTests:QuickstepKeyGestureEventsHandlerTest Test: atest NexusLauncherTests:AllAppsActionManagerTest Flag: com.android.window.flags.grant_manage_key_gestures_to_recents Bug: 406452076 Change-Id: I66f8c9b2f23eb65bafc986321ff971c855ce00a3 --- .../input/QuickstepKeyGestureEventsManager.kt | 12 +++--- .../QuickstepKeyGestureEventsHandlerTest.kt | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt index 6087cf4af2..9d4e00d636 100644 --- a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt +++ b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt @@ -59,7 +59,7 @@ class QuickstepKeyGestureEventsManager(context: Context) { val allAppsKeyGestureEventHandler = object : KeyGestureEventHandler { override fun handleKeyGestureEvent(event: KeyGestureEvent, focusedToken: IBinder?) { - if (!Flags.enableKeyGestureHandlerForRecents()) { + if (!Flags.grantManageKeyGesturesToRecents()) { return } if (!isUserSetupCompleted) { @@ -80,7 +80,7 @@ class QuickstepKeyGestureEventsManager(context: Context) { val overviewKeyGestureEventHandler = object : KeyGestureEventHandler { override fun handleKeyGestureEvent(event: KeyGestureEvent, focusedToken: IBinder?) { - if (!Flags.enableKeyGestureHandlerForRecents()) { + if (!Flags.grantManageKeyGesturesToRecents()) { return } if (!isUserSetupCompleted) { @@ -114,7 +114,7 @@ class QuickstepKeyGestureEventsManager(context: Context) { /** Registers the all apps key gesture events. */ fun registerAllAppsKeyGestureEvent(allAppsPendingIntent: PendingIntent) { - if (Flags.enableKeyGestureHandlerForRecents()) { + if (Flags.grantManageKeyGesturesToRecents()) { this.allAppsPendingIntent = allAppsPendingIntent inputManager.registerKeyGestureEventHandler( listOf(KEY_GESTURE_TYPE_ALL_APPS), @@ -125,14 +125,14 @@ class QuickstepKeyGestureEventsManager(context: Context) { /** Unregisters the all apps key gesture events. */ fun unregisterAllAppsKeyGestureEvent() { - if (Flags.enableKeyGestureHandlerForRecents()) { + if (Flags.grantManageKeyGesturesToRecents()) { inputManager.unregisterKeyGestureEventHandler(allAppsKeyGestureEventHandler) } } /** Registers the overview key gesture events. */ fun registerOverviewKeyGestureEvent(overviewGestureHandler: OverviewGestureHandler) { - if (Flags.enableKeyGestureHandlerForRecents()) { + if (Flags.grantManageKeyGesturesToRecents()) { this.overviewGestureHandler = overviewGestureHandler inputManager.registerKeyGestureEventHandler( listOf(KEY_GESTURE_TYPE_RECENT_APPS, KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER), @@ -143,7 +143,7 @@ class QuickstepKeyGestureEventsManager(context: Context) { /** Unregisters the overview key gesture events. */ fun unregisterOverviewKeyGestureEvent() { - if (Flags.enableKeyGestureHandlerForRecents()) { + if (Flags.grantManageKeyGesturesToRecents()) { inputManager.unregisterKeyGestureEventHandler(overviewKeyGestureEventHandler) } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt index a8a9194257..be1b2949a6 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt @@ -73,7 +73,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun registerAllAppsHandler_flagEnabled_registerWithExpectedKeyGestureEvents() { keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) @@ -86,7 +86,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun registerAllAppsHandler_flagDisabled_noRegister() { keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) @@ -94,7 +94,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun registerOverviewHandler_flagEnabled_registerWithExpectedKeyGestureEvents() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -108,7 +108,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun registerOverviewHandler_flagDisabled_noRegister() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -116,7 +116,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun unregisterAllAppsHandler_flagEnabled_unregisterHandler() { keyGestureEventsManager.unregisterAllAppsKeyGestureEvent() @@ -127,7 +127,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun unregisterAllAppsHandler_flagDisabled_noUnregister() { keyGestureEventsManager.unregisterAllAppsKeyGestureEvent() @@ -135,7 +135,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun unregisterOverviewHandler_flagEnabled_unregisterHandler() { keyGestureEventsManager.unregisterOverviewKeyGestureEvent() @@ -146,7 +146,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun unregisterOverviewHandler_flagDisabled_noUnregister() { keyGestureEventsManager.unregisterOverviewKeyGestureEvent() @@ -154,7 +154,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleAllAppsEvent_flagEnabled_toggleAllAppsSearch() { keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) @@ -170,7 +170,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleAllAppsEvent_flagEnabled_userSetupIncomplete_noInteractionWithTaskbar() { keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( /* isEnabled= */ false @@ -189,7 +189,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleAllAppsEvent_flagDisabled_noInteractionWithTaskbar() { keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) @@ -205,7 +205,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsEvent_flagEnabled_showOverviewWithUndefinedType() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -223,7 +223,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsEvent_userSetupIncomplete_noOverviewEventInFake() { keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( /* isEnabled= */ false @@ -243,7 +243,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsEvent_flagDisabled_noOverviewEventInFake() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -260,7 +260,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherStartEvent_flagEnabled_showOverviewWithAltTabType() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -278,7 +278,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherStartEvent_userSetupIncomplete_noOverviewEventInFake() { keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( /* isEnabled= */ false @@ -298,7 +298,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherStartEvent_flagDisabled_noOverviewEventInFake() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -315,7 +315,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherCompleteEvent_flagEnabled_hideOverviewWithAltTabType() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler) @@ -333,7 +333,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @EnableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherCompleteEvent_userSetupIncomplete_noOverviewEventInFake() { keyGestureEventsManager.onUserSetupCompleteListener.onSettingsChanged( /* isEnabled= */ false @@ -353,7 +353,7 @@ class QuickstepKeyGestureEventsHandlerTest { } @Test - @DisableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) + @DisableFlags(Flags.FLAG_GRANT_MANAGE_KEY_GESTURES_TO_RECENTS) fun handleRecentAppsSwitcherCompleteEvent_flagDisabled_noOverviewEventInFake() { keyGestureEventsManager.registerOverviewKeyGestureEvent(fakeOverviewHandler)