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

Commit 01328e2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I720a6477,I49fd8edc into main 

* changes:
  Desks: Incompatible Tasks (2/2) - Adjust launch WCT for desks
  Desks: Incompatible Tasks (1/2) - Merge isDesktopModeShowing()/isAnyDeskActive()
parents aed44764 e1d182b8

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

+18 −16
Original line number Diff line number Diff line
@@ -756,12 +756,10 @@ class DesktopRepository( 
    fun getTaskInFullImmersiveState(displayId: Int): Int? =

        desktopData.getActiveDesk(displayId)?.fullImmersiveTaskId



    /**

     * Sets the top transparent fullscreen task id for a given display's active desk.

     *

     * TODO: b/389960283 - add explicit [deskId] argument.

     */

    /** Sets the top transparent fullscreen task id for a given display's active desk. */

    @Deprecated("Deprecated with multiple desks")

    fun setTopTransparentFullscreenTaskId(displayId: Int, taskId: Int) {

        if (DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) return

        logD(

            "Top transparent fullscreen task set for display: taskId=%d, displayId=%d",

            taskId,
@@ -770,23 +768,18 @@ class DesktopRepository( 
        desktopData.getActiveDesk(displayId)?.topTransparentFullscreenTaskId = taskId

    }



    /**

     * Returns the top transparent fullscreen task id for a given display, or null.

     *

     * TODO: b/389960283 - add explicit [deskId] argument.

     */

    /** Returns the top transparent fullscreen task id for a given display, or null. */

    @Deprecated("Deprecated with multiple desks")

    fun getTopTransparentFullscreenTaskId(displayId: Int): Int? =

        desktopData

            .desksSequence(displayId)

            .mapNotNull { it.topTransparentFullscreenTaskId }

            .firstOrNull()



    /**

     * Clears the top transparent fullscreen task id info for a given display's active desk.

     *

     * TODO: b/389960283 - add explicit [deskId] argument.

     */

    /** Clears the top transparent fullscreen task id info for a given display's active desk. */

    @Deprecated("Deprecated with multiple desks")

    fun clearTopTransparentFullscreenTaskId(displayId: Int) {

        if (DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) return

        logD(

            "Top transparent fullscreen task cleared for display: taskId=%d, displayId=%d",

            desktopData.getActiveDesk(displayId)?.topTransparentFullscreenTaskId,
@@ -810,7 +803,16 @@ class DesktopRepository( 
                logE("Could not find default desk for display: $displayId")

                return false

            }

            return desk.visibleTasks.isNotEmpty()

            val hasVisibleTasks = desk.visibleTasks.isNotEmpty()

            val hasTopTransparentFullscreenTask =

                getTopTransparentFullscreenTaskId(displayId) != null

            if (

                DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                    .isTrue && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue

            ) {

                return hasVisibleTasks || hasTopTransparentFullscreenTask

            }

            return hasVisibleTasks

        }

        return desktopData.getActiveDesk(displayId) != null

    }

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

+58 −55
Original line number Diff line number Diff line
@@ -369,34 +369,6 @@ class DesktopTasksController( 
    /** Returns whether the given display has an active desk. */

    fun isAnyDeskActive(displayId: Int): Boolean = taskRepository.isAnyDeskActive(displayId)



    /**

     * Returns true if any freeform tasks are visible or if a transparent fullscreen task exists on

     * top in Desktop Mode.

     *

     * TODO: b/362720497 - consolidate with [isAnyDeskActive].

     *     - top-transparent-fullscreen case: should not be needed if we allow it to launch inside

     *       the desk in fullscreen instead of force-exiting desktop and having to trick this method

     *       into thinking it is in desktop mode when a task in this state exists.

     */

    fun isDesktopModeShowing(displayId: Int): Boolean {

        val hasVisibleTasks = taskRepository.isAnyDeskActive(displayId)

        val hasTopTransparentFullscreenTask =

            taskRepository.getTopTransparentFullscreenTaskId(displayId) != null

        if (

            DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                .isTrue() && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue()

        ) {

            logV(

                "isDesktopModeShowing: hasVisibleTasks=%s hasTopTransparentFullscreenTask=%s",

                hasVisibleTasks,

                hasTopTransparentFullscreenTask,

            )

            return hasVisibleTasks || hasTopTransparentFullscreenTask

        }

        logV("isDesktopModeShowing: hasVisibleTasks=%s", hasVisibleTasks)

        return hasVisibleTasks

    }



    /** Moves focused task to desktop mode for given [displayId]. */

    fun moveFocusedTaskToDesktop(displayId: Int, transitionSource: DesktopModeTransitionSource) {

        val allFocusedTasks = getAllFocusedTasks(displayId)
@@ -1152,7 +1124,7 @@ class DesktopTasksController( 
                DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue ->

                    !taskRepository.isDeskActive(deskId)

                DesktopExperienceFlags.ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING.isTrue -> {

                    !isDesktopModeShowing(displayId)

                    !isAnyDeskActive(displayId)

                }

                else -> false

            }
@@ -2118,7 +2090,7 @@ class DesktopTasksController( 
        // Only immersive mixed transition are currently supported.

        if (!DesktopModeFlags.ENABLE_FULLY_IMMERSIVE_IN_DESKTOP.isTrue) return false

        val triggerTask = info.triggerTask ?: return false

        if (!isDesktopModeShowing(triggerTask.displayId)) {

        if (!isAnyDeskActive(triggerTask.displayId)) {

            return false

        }

        if (!TransitionUtil.isOpeningType(info.type)) {
@@ -2464,7 +2436,7 @@ class DesktopTasksController( 
                val runOnTransitStart: RunOnTransitStart? =

                    if (

                        task.baseIntent.flags.and(Intent.FLAG_ACTIVITY_TASK_ON_HOME) != 0 ||

                            !isDesktopModeShowing(task.displayId)

                            !isAnyDeskActive(task.displayId)

                    ) {

                        // In some launches home task is moved behind new task being launched. Make

                        // sure that's not the case for launches in desktop. Also, if this launch is
@@ -2527,10 +2499,10 @@ class DesktopTasksController( 
    }



    private fun shouldFreeformTaskLaunchSwitchToFullscreen(task: RunningTaskInfo): Boolean =

        !isDesktopModeShowing(task.displayId)

        !isAnyDeskActive(task.displayId)



    private fun shouldFullscreenTaskLaunchSwitchToDesktop(task: RunningTaskInfo): Boolean =

        isDesktopModeShowing(task.displayId) || forceEnterDesktop(task.displayId)

        isAnyDeskActive(task.displayId) || forceEnterDesktop(task.displayId)



    /**

     * If a task is not compatible with desktop mode freeform, it should always be launched in
@@ -2540,14 +2512,25 @@ class DesktopTasksController( 
        task: RunningTaskInfo,

        transition: IBinder,

    ): WindowContainerTransaction? {

        logV("handleIncompatibleTaskLaunch")

        if (!isDesktopModeShowing(task.displayId) && !forceEnterDesktop(task.displayId)) return null

        // Only update task repository for transparent task.

        val taskId = task.taskId

        val displayId = task.displayId

        val inDesktop = isAnyDeskActive(displayId)

        val isTransparentTask = desktopModeCompatPolicy.isTransparentTask(task)

        logV(

            "handleIncompatibleTaskLaunch taskId=%d displayId=%d isTransparent=%b inDesktop=%b",

            taskId,

            displayId,

            isTransparentTask,

            inDesktop,

        )

        if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

            if (!inDesktop && !forceEnterDesktop(displayId)) return null

            if (

                DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                .isTrue() && desktopModeCompatPolicy.isTransparentTask(task)

                    .isTrue && isTransparentTask

            ) {

            taskRepository.setTopTransparentFullscreenTaskId(task.displayId, task.taskId)

                // Only update task repository for transparent task.

                taskRepository.setTopTransparentFullscreenTaskId(displayId, taskId)

            }

            // Already fullscreen, no-op.

            if (task.isFullscreen) return null
@@ -2558,14 +2541,37 @@ class DesktopTasksController( 
                    taskInfo = task,

                    willExitDesktop =

                        willExitDesktop(

                        triggerTaskId = task.taskId,

                        displayId = task.displayId,

                            triggerTaskId = taskId,

                            displayId = displayId,

                            forceExitDesktop = true,

                        ),

                )

            runOnTransitStart?.invoke(transition)

            return wct

        }

        if (!inDesktop) {

            logD("handleIncompatibleTaskLaunch not in desktop, nothing to do")

            return null

        }

        // Both opaque and transparent incompatible tasks need to be forced to fullscreen, but

        // opaque ones force-exit the desktop while transparent ones are just shown on top of the

        // desktop while keeping it active.

        val willExitDesktop = !isTransparentTask

        if (willExitDesktop) {

            logD("handleIncompatibleTaskLaunch forcing task to fullscreen and exiting desktop")

        } else {

            logD("handleIncompatibleTaskLaunch forcing task to fullscreen and staying in desktop")

        }

        val wct = WindowContainerTransaction()

        val runOnTransitStart =

            addMoveToFullscreenChanges(

                wct = wct,

                taskInfo = task,

                willExitDesktop = willExitDesktop,

            )

        runOnTransitStart?.invoke(transition)

        return wct

    }



    /**

     * Handle task closing by removing wallpaper activity if it's the last active task.
@@ -2578,7 +2584,7 @@ class DesktopTasksController( 
        requestType: Int,

    ): WindowContainerTransaction? {

        logV("handleTaskClosing")

        if (!isDesktopModeShowing(task.displayId)) return null

        if (!isAnyDeskActive(task.displayId)) return null

        val deskId = taskRepository.getDeskIdForTask(task.taskId)

        if (deskId == null && DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

            return null
@@ -2745,10 +2751,7 @@ class DesktopTasksController( 
        return bounds

    }



    /**

     * Applies the changes needed to enter fullscreen and returns the id of the desk that needs to

     * be deactivated.

     */

    /** Applies the changes needed to enter fullscreen and clean up the desktop if needed. */

    private fun addMoveToFullscreenChanges(

        wct: WindowContainerTransaction,

        taskInfo: RunningTaskInfo,
@@ -3567,7 +3570,7 @@ class DesktopTasksController( 
        onFinishCallback: Consumer<Boolean>,

    ): Boolean {

        // TODO(b/320797628): Pass through which display we are dropping onto

        if (!isDesktopModeShowing(DEFAULT_DISPLAY)) {

        if (!isAnyDeskActive(DEFAULT_DISPLAY)) {

            // Not currently in desktop mode, ignore the drop

            return false

        }

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

+3 −2
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ class DesktopTasksTransitionObserver( 
    ) {

        // TODO: b/332682201 Update repository state

        if (

            DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC

                .isTrue() && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue()

            DesktopModeFlags.INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC.isTrue &&

                DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue &&

                !DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue

        ) {

            updateTopTransparentFullscreenTaskId(info)

        }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -2913,7 +2913,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        final boolean isOpening = isOpeningType(type);

        final boolean inFullscreen = triggerTask.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;

        final boolean inDesktopMode = mDesktopTasksController.isPresent()

                && mDesktopTasksController.get().isDesktopModeShowing(mDisplayId);

                && mDesktopTasksController.get().isAnyDeskActive(mDisplayId);

        final boolean isLaunchingDesktopTask = isOpening && DesktopModeStatus.canEnterDesktopMode(

                mContext) && triggerTask.getWindowingMode() == WINDOWING_MODE_FREEFORM;

        final StageTaskListener stage = getStageOfTask(triggerTask);

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

+2 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,7 @@ class DesktopRepositoryTest(flags: FlagsParameterization) : ShellTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun setTaskIdAsTopTransparentFullscreenTaskId_savesTaskId() {

        repo.setTopTransparentFullscreenTaskId(displayId = DEFAULT_DISPLAY, taskId = 1)
@@ -1174,6 +1175,7 @@ class DesktopRepositoryTest(flags: FlagsParameterization) : ShellTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun clearTaskIdAsTopTransparentFullscreenTaskId_clearsTaskId() {

        repo.setTopTransparentFullscreenTaskId(displayId = DEFAULT_DISPLAY, taskId = 1)