diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index dc3e2d02c245..5f3b0c9ee435 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -217,6 +217,15 @@ class DesktopTasksController( dragToDesktopTransitionHandler.setSplitScreenController(controller) } + /** Returns the transition type for the given remote transition. */ + private fun transitionType(remoteTransition: RemoteTransition?): Int { + if (remoteTransition == null) { + ProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: remoteTransition is null") + return TRANSIT_NONE + } + return TRANSIT_TO_FRONT + } + /** Show all tasks, that are part of the desktop, on top of launcher */ fun showDesktopApps(displayId: Int, remoteTransition: RemoteTransition? = null) { ProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: showDesktopApps") @@ -224,8 +233,7 @@ class DesktopTasksController( bringDesktopAppsToFront(displayId, wct) if (Transitions.ENABLE_SHELL_TRANSITIONS) { - // TODO(b/309014605): ensure remote transition is supplied once state is introduced - val transitionType = if (remoteTransition == null) TRANSIT_NONE else TRANSIT_TO_FRONT + val transitionType = transitionType(remoteTransition) val handler = remoteTransition?.let { OneShotRemoteHandler(transitions.mainExecutor, remoteTransition) |