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

Commit b3717230 authored by Ats Jenk's avatar Ats Jenk
Browse files

Don't convert task windowing mode while recents is running 

A task can be in running state when recents is open.
This causes issues for desktop state tracking. It relies on freeform
tasks being visible and running to determine if we are on desktop.
While recents is open, do not process handleRequest calls.
Otherwise we would process any task launches as launches on desktop and
try to convert the windowing mode accordingly.

Bug: 297590571
Test: atest DesktopTasksControllerTest

Change-Id: I5d4bd89e36980994f9877eea22c936d6d0667cfc
parent b97aedb8

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −1
Original line number Diff line number Diff line
@@ -492,13 +492,14 @@ public abstract class WMShellModule { 
            ToggleResizeDesktopTaskTransitionHandler toggleResizeDesktopTaskTransitionHandler,

            @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,

            LaunchAdjacentController launchAdjacentController,

            RecentsTransitionHandler recentsTransitionHandler,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController,

                displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer,

                transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler,

                toggleResizeDesktopTaskTransitionHandler, desktopModeTaskRepository,

                launchAdjacentController, mainExecutor);

                launchAdjacentController, recentsTransitionHandler, mainExecutor);

    }



    @WMSingleton

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

+22 −1
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP 
import com.android.wm.shell.desktopmode.DesktopModeTaskRepository.VisibleTasksListener

import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.TO_DESKTOP_INDICATOR

import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE

import com.android.wm.shell.recents.RecentsTransitionHandler

import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.splitscreen.SplitScreenController

import com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_ENTER_DESKTOP

import com.android.wm.shell.sysui.ShellCommandHandler
@@ -68,7 +70,6 @@ import com.android.wm.shell.sysui.ShellInit 
import com.android.wm.shell.sysui.ShellSharedConstants

import com.android.wm.shell.transition.OneShotRemoteHandler

import com.android.wm.shell.transition.Transitions

import com.android.wm.shell.transition.Transitions.TransitionHandler

import com.android.wm.shell.util.KtProtoLog

import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration

import com.android.wm.shell.windowdecor.MoveToDesktopAnimator
@@ -93,6 +94,7 @@ class DesktopTasksController( 
        ToggleResizeDesktopTaskTransitionHandler,

        private val desktopModeTaskRepository: DesktopModeTaskRepository,

        private val launchAdjacentController: LaunchAdjacentController,

        private val recentsTransitionHandler: RecentsTransitionHandler,

        @ShellMainThread private val mainExecutor: ShellExecutor

) : RemoteCallable<DesktopTasksController>, Transitions.TransitionHandler {
@@ -119,6 +121,8 @@ class DesktopTasksController( 
            com.android.wm.shell.R.dimen.desktop_mode_transition_area_width

        )



    private var recentsAnimationRunning = false



    // This is public to avoid cyclic dependency; it is set by SplitScreenController

    lateinit var splitScreenController: SplitScreenController
@@ -139,6 +143,19 @@ class DesktopTasksController( 
        )

        transitions.addHandler(this)

        desktopModeTaskRepository.addVisibleTasksListener(taskVisibilityListener, mainExecutor)



        recentsTransitionHandler.addTransitionStateListener(

            object : RecentsTransitionStateListener {

                override fun onAnimationStateChanged(running: Boolean) {

                    KtProtoLog.v(

                        WM_SHELL_DESKTOP_MODE,

                        "DesktopTasksController: recents animation state changed running=%b",

                        running

                    )

                    recentsAnimationRunning = running

                }

            }

        )

    }



    /** Show all tasks, that are part of the desktop, on top of launcher */
@@ -644,6 +661,10 @@ class DesktopTasksController( 
        val triggerTask = request.triggerTask

        val shouldHandleRequest =

            when {

                recentsAnimationRunning -> {

                    reason = "recents animation is running"

                    false

                }

                // Only handle open or to front transitions

                request.type != TRANSIT_OPEN && request.type != TRANSIT_TO_FRONT -> {

                    reason = "transition type not handled (${request.type})"

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+25 −2
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreef 
import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createHomeTask

import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createSplitScreenTask

import com.android.wm.shell.recents.RecentsTransitionHandler

import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.splitscreen.SplitScreenController

import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController
@@ -101,11 +103,13 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Mock lateinit var launchAdjacentController: LaunchAdjacentController

    @Mock lateinit var desktopModeWindowDecoration: DesktopModeWindowDecoration

    @Mock lateinit var splitScreenController: SplitScreenController

    @Mock lateinit var recentsTransitionHandler: RecentsTransitionHandler



    private lateinit var mockitoSession: StaticMockitoSession

    private lateinit var controller: DesktopTasksController

    private lateinit var shellInit: ShellInit

    private lateinit var desktopModeTaskRepository: DesktopModeTaskRepository

    private lateinit var recentsTransitionStateListener: RecentsTransitionStateListener



    private val shellExecutor = TestShellExecutor()

    // Mock running tasks are registered here so we can get the list from mock shell task organizer
@@ -126,6 +130,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        controller.splitScreenController = splitScreenController



        shellInit.init()



        val captor = ArgumentCaptor.forClass(RecentsTransitionStateListener::class.java)

        verify(recentsTransitionHandler).addTransitionStateListener(captor.capture())

        recentsTransitionStateListener = captor.value

    }



    private fun createController(): DesktopTasksController {
@@ -144,6 +152,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
            mToggleResizeDesktopTaskTransitionHandler,

            desktopModeTaskRepository,

            launchAdjacentController,

            recentsTransitionHandler,

            shellExecutor

        )

    }
@@ -355,7 +364,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


    @Test

    fun moveToDesktop_splitTaskExitsSplit() {

        var task = setUpSplitScreenTask()

        val task = setUpSplitScreenTask()

        controller.moveToDesktop(desktopModeWindowDecoration, task)

        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -367,7 +376,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


    @Test

    fun moveToDesktop_fullscreenTaskDoesNotExitSplit() {

        var task = setUpFullscreenTask()

        val task = setUpFullscreenTask()

        controller.moveToDesktop(desktopModeWindowDecoration, task)

        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -665,6 +674,20 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        assertThat(controller.handleRequest(Binder(), createTransition(task))).isNull()

    }



    @Test

    fun handleRequest_recentsAnimationRunning_returnNull() {

        // Set up a visible freeform task so a fullscreen task should be converted to freeform

        val freeformTask = setUpFreeformTask()

        markTaskVisible(freeformTask)



        // Mark recents animation running

        recentsTransitionStateListener.onAnimationStateChanged(true)



        // Open a fullscreen task, check that it does not result in a WCT with changes to it

        val fullscreenTask = createFullscreenTask()

        assertThat(controller.handleRequest(Binder(), createTransition(fullscreenTask))).isNull()

    }



    @Test

    fun stashDesktopApps_stateUpdates() {

        whenever(DesktopModeStatus.isStashingEnabled()).thenReturn(true)