From d3c7533a55776d80f070cb846c1b1ba77574340b Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Thu, 29 May 2025 17:27:31 +0100 Subject: [PATCH] Unregister all apps key gesture handler at AllAppsActionManager#onDestory Bug: 406452076 Flag: com.android.window.flags.grant_manage_key_gestures_to_recents Test: atest NexusLauncherTests:AllAppsActionManagerTest Change-Id: Idec5ad32b190eff58c263d6c7696a9f218084f5a --- .../src/com/android/quickstep/AllAppsActionManager.kt | 1 + .../src/com/android/quickstep/AllAppsActionManagerTest.kt | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/quickstep/src/com/android/quickstep/AllAppsActionManager.kt b/quickstep/src/com/android/quickstep/AllAppsActionManager.kt index 2d179f95df..51a68d16da 100644 --- a/quickstep/src/com/android/quickstep/AllAppsActionManager.kt +++ b/quickstep/src/com/android/quickstep/AllAppsActionManager.kt @@ -119,6 +119,7 @@ class AllAppsActionManager( context .getSystemService(AccessibilityManager::class.java) ?.unregisterSystemAction(GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS) + quickstepKeyGestureEventsManager.unregisterAllAppsKeyGestureEvent() SettingsCache.INSTANCE[context].unregister( USER_SETUP_COMPLETE_URI, onSettingsChangeListener, diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt index b9e52092c6..acfa9b40eb 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/AllAppsActionManagerTest.kt @@ -172,6 +172,13 @@ class AllAppsActionManagerTest { assertThat(allAppsActionManager.isActionRegistered).isTrue() verify(quickstepKeyGestureEventsManager).registerAllAppsKeyGestureEvent(any()) } + + @Test + fun onDestroy_shouldUnregisterAllAppsKeyGestureHandler() { + allAppsActionManager.onDestroy() + + verify(quickstepKeyGestureEventsManager).unregisterAllAppsKeyGestureEvent() + } } @LauncherAppSingleton