commit 1295fc62df19741e5ed02ff798a0b2983a20c21f
author Schneider Victor-tulias <victortulias@google.com> Wed Nov 06 15:12:10 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 06 15:12:10 2024 +0000
tree df4358d6aa013ed7d214346bfc1901601c86120b
parent 4ba51f3bf9264f0dac8af4ee728ee32ce0f5a558
parent 222d204314527ea74d310630b3aee90aa99f46fa

Merge "Add SystemOnBackInvokedCallback to RecentsWindowManager" into main

quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt

diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt
index 78224ae..843ef6c 100644
--- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt
+++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt
@@ -218,6 +218,11 @@
             )
         }
 
+    private val onBackInvokedCallback: () -> Unit = {
+        // If we are in live tile mode, launch the live task, otherwise return home
+        recentsView?.runningTaskView?.launchWithAnimation() ?: startHome()
+    }
+
     private fun cleanupRecentsWindow() {
         RecentsWindowProtoLogProxy.logCleanup(isShowing())
         if (isShowing()) {
@@ -241,6 +246,10 @@
         }
         windowManager.addView(windowView, windowLayoutParams)
 
+        windowView
+            ?.findOnBackInvokedDispatcher()
+            ?.registerSystemOnBackInvokedCallback(onBackInvokedCallback)
+
         windowView?.systemUiVisibility =
             (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
                 View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or