Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13383477 authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Android (Google) Code Review
Browse files

Merge "Remove resolved TODO about remote transition from... 

Merge "Remove resolved TODO about remote transition from DesktopTasksController since it is now resolved with the wallpaper activity flag." into main
parents 33598e2d a0da1881

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+10 −2
Original line number Diff line number Diff line
@@ -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)