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

Commit 98f85f45 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Desktop Windowing: Log task minimize reasons 

Add minimize reason to the information logged when a desktop task goes
from visible to invisible.

Test: use atomviewer to ensure minimize reasons logged
Flag: com.android.window.flags.enable_desktop_windowing_task_limit
Bug: 358002042
Change-Id: I1411fb7a55cdb9b3908c20dd8d542faaa54a83a6
parent 28cef9b7

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

+5 −2
Original line number Diff line number Diff line
@@ -1153,9 +1153,12 @@ public abstract class WMShellModule { 
            Context context,

            ShellInit shellInit,

            Transitions transitions,

            DesktopModeEventLogger desktopModeEventLogger) {

            DesktopModeEventLogger desktopModeEventLogger,

            Optional<DesktopTasksLimiter> desktopTasksLimiter,

            ShellTaskOrganizer shellTaskOrganizer) {

        return new DesktopModeLoggerTransitionObserver(

                context, shellInit, transitions, desktopModeEventLogger);

                context, shellInit, transitions, desktopModeEventLogger,

                desktopTasksLimiter, shellTaskOrganizer);

    }



    @WMSingleton

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

+5 −1
Original line number Diff line number Diff line
@@ -467,9 +467,13 @@ class DesktopModeEventLogger { 
                FrameworkStatsLog

                    .DESKTOP_MODE_SESSION_TASK_UPDATE__MINIMIZE_REASON__MINIMIZE_TASK_LIMIT

            ),

            MINIMIZE_BUTTON( // TODO(b/356843241): use this enum value

            MINIMIZE_BUTTON(

                FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__MINIMIZE_REASON__MINIMIZE_BUTTON

            ),

            KEY_GESTURE(

                FrameworkStatsLog

                    .DESKTOP_MODE_SESSION_TASK_UPDATE__MINIMIZE_REASON__MINIMIZE_KEY_GESTURE

            ),

        }



        // Default value used when the task was not unminimized.

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

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.window.flags.Flags.enableTaskResizingKeyboardShortcuts 
import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.MinimizeReason

import com.android.wm.shell.desktopmode.common.ToggleTaskSizeInteraction

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

import com.android.wm.shell.shared.annotations.ShellMainThread
@@ -125,7 +126,9 @@ class DesktopModeKeyGestureHandler( 
            KeyGestureEvent.KEY_GESTURE_TYPE_MINIMIZE_FREEFORM_WINDOW -> {

                logV("Key gesture MINIMIZE_FREEFORM_WINDOW is handled")

                getGloballyFocusedFreeformTask()?.let {

                    mainExecutor.execute { desktopTasksController.get().minimizeTask(it) }

                    mainExecutor.execute {

                        desktopTasksController.get().minimizeTask(it, MinimizeReason.KEY_GESTURE)

                    }

                }

                return true

            }

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

+29 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import androidx.core.util.isNotEmpty 
import androidx.core.util.plus

import androidx.core.util.putAll

import com.android.internal.protolog.ProtoLog

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.EnterReason

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ExitReason

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.MinimizeReason
@@ -52,6 +53,8 @@ import com.android.wm.shell.shared.TransitionUtil 
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import com.android.wm.shell.sysui.ShellInit

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

import java.util.Optional

import kotlin.jvm.optionals.getOrNull



/**

 * A [Transitions.TransitionObserver] that observes transitions and the proposed changes to log
@@ -63,6 +66,8 @@ class DesktopModeLoggerTransitionObserver( 
    shellInit: ShellInit,

    private val transitions: Transitions,

    private val desktopModeEventLogger: DesktopModeEventLogger,

    private val desktopTasksLimiter: Optional<DesktopTasksLimiter>,

    private val shellTaskOrganizer: ShellTaskOrganizer,

) : Transitions.TransitionObserver {



    init {
@@ -141,6 +146,7 @@ class DesktopModeLoggerTransitionObserver( 


        // identify if we need to log any changes and update the state of visible freeform tasks

        identifyLogEventAndUpdateState(

            transition = transition,

            transitionInfo = info,

            preTransitionVisibleFreeformTasks = visibleFreeformTaskInfos,

            postTransitionVisibleFreeformTasks = postTransitionVisibleFreeformTasks,
@@ -227,6 +233,7 @@ class DesktopModeLoggerTransitionObserver( 
     * state and update it

     */

    private fun identifyLogEventAndUpdateState(

        transition: IBinder,

        transitionInfo: TransitionInfo,

        preTransitionVisibleFreeformTasks: SparseArray<TaskInfo>,

        postTransitionVisibleFreeformTasks: SparseArray<TaskInfo>,
@@ -238,6 +245,7 @@ class DesktopModeLoggerTransitionObserver( 
        ) {

            // Sessions is finishing, log task updates followed by an exit event

            identifyAndLogTaskUpdates(

                transition,

                transitionInfo,

                preTransitionVisibleFreeformTasks,

                postTransitionVisibleFreeformTasks,
@@ -255,6 +263,7 @@ class DesktopModeLoggerTransitionObserver( 
            desktopModeEventLogger.logSessionEnter(getEnterReason(transitionInfo))



            identifyAndLogTaskUpdates(

                transition,

                transitionInfo,

                preTransitionVisibleFreeformTasks,

                postTransitionVisibleFreeformTasks,
@@ -262,6 +271,7 @@ class DesktopModeLoggerTransitionObserver( 
        } else if (isSessionActive) {

            // Session is neither starting, nor finishing, log task updates if there are any

            identifyAndLogTaskUpdates(

                transition,

                transitionInfo,

                preTransitionVisibleFreeformTasks,

                postTransitionVisibleFreeformTasks,
@@ -275,6 +285,7 @@ class DesktopModeLoggerTransitionObserver( 


    /** Compare the old and new state of taskInfos and identify and log the changes */

    private fun identifyAndLogTaskUpdates(

        transition: IBinder,

        transitionInfo: TransitionInfo,

        preTransitionVisibleFreeformTasks: SparseArray<TaskInfo>,

        postTransitionVisibleFreeformTasks: SparseArray<TaskInfo>,
@@ -310,12 +321,9 @@ class DesktopModeLoggerTransitionObserver( 
        // find old tasks that were removed

        preTransitionVisibleFreeformTasks.forEach { taskId, taskInfo ->

            if (!postTransitionVisibleFreeformTasks.containsKey(taskId)) {

                val minimizeReason =

                    if (transitionInfo.type == Transitions.TRANSIT_MINIMIZE) {

                        MinimizeReason.MINIMIZE_BUTTON

                    } else {

                        null

                    }

                // The task is no longer visible, it might have been minimized, get the minimize

                // reason (if any)

                val minimizeReason = getMinimizeReason(transition, transitionInfo, taskInfo)

                val taskUpdate =

                    buildTaskUpdateForTask(

                        taskInfo,
@@ -336,6 +344,21 @@ class DesktopModeLoggerTransitionObserver( 
        }

    }



    private fun getMinimizeReason(

        transition: IBinder,

        transitionInfo: TransitionInfo,

        taskInfo: TaskInfo,

    ): MinimizeReason? {

        if (transitionInfo.type == Transitions.TRANSIT_MINIMIZE) {

            return MinimizeReason.MINIMIZE_BUTTON

        }

        val minimizingTask = desktopTasksLimiter.getOrNull()?.getMinimizingTask(transition)

        if (minimizingTask?.taskId == taskInfo.taskId) {

            return minimizingTask.minimizeReason

        }

        return null

    }



    private fun buildTaskUpdateForTask(

        taskInfo: TaskInfo,

        visibleTasks: Int,

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

+27 −12
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import com.android.wm.shell.common.SyncTransactionQueue 
import com.android.wm.shell.compatui.isTopActivityExemptFromDesktopWindowing

import com.android.wm.shell.compatui.isTransparentTask

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.InputMethod

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.MinimizeReason

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ResizeTrigger

import com.android.wm.shell.desktopmode.DesktopModeUiEventLogger.DesktopUiEventEnum

import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.DragStartState
@@ -465,7 +466,9 @@ class DesktopTasksController( 
        desktopModeEnterExitTransitionListener?.onEnterDesktopModeTransitionStarted(

            FREEFORM_ANIMATION_DURATION

        )

        taskIdToMinimize?.let { addPendingMinimizeTransition(transition, it) }

        taskIdToMinimize?.let {

            addPendingMinimizeTransition(transition, it, MinimizeReason.TASK_LIMIT)

        }

        exitResult.asExit()?.runOnTransitionStart?.invoke(transition)

        return true

    }
@@ -511,7 +514,9 @@ class DesktopTasksController( 
        desktopModeEnterExitTransitionListener?.onEnterDesktopModeTransitionStarted(

            FREEFORM_ANIMATION_DURATION

        )

        taskIdToMinimize?.let { addPendingMinimizeTransition(transition, it) }

        taskIdToMinimize?.let {

            addPendingMinimizeTransition(transition, it, MinimizeReason.TASK_LIMIT)

        }

        exitResult.asExit()?.runOnTransitionStart?.invoke(transition)

    }
@@ -568,7 +573,9 @@ class DesktopTasksController( 
            DRAG_TO_DESKTOP_FINISH_ANIM_DURATION_MS.toInt()

        )

        transition?.let {

            taskIdToMinimize?.let { taskId -> addPendingMinimizeTransition(it, taskId) }

            taskIdToMinimize?.let { taskId ->

                addPendingMinimizeTransition(it, taskId, MinimizeReason.TASK_LIMIT)

            }

            exitResult.asExit()?.runOnTransitionStart?.invoke(transition)

        }

    }
@@ -617,7 +624,7 @@ class DesktopTasksController( 
            ?.runOnTransitionStart

    }



    fun minimizeTask(taskInfo: RunningTaskInfo) {

    fun minimizeTask(taskInfo: RunningTaskInfo, minimizeReason: MinimizeReason) {

        val wct = WindowContainerTransaction()



        val isMinimizingToPip = taskInfo.pictureInPictureParams?.isAutoEnterEnabled() ?: false
@@ -637,16 +644,16 @@ class DesktopTasksController( 
            freeformTaskTransitionStarter.startPipTransition(wct)

            taskRepository.setTaskInPip(taskInfo.displayId, taskInfo.taskId, enterPip = true)

            taskRepository.setOnPipAbortedCallback { displayId, taskId ->

                minimizeTaskInner(shellTaskOrganizer.getRunningTaskInfo(taskId)!!)

                minimizeTaskInner(shellTaskOrganizer.getRunningTaskInfo(taskId)!!, minimizeReason)

                taskRepository.setTaskInPip(displayId, taskId, enterPip = false)

            }

            return

        }



        minimizeTaskInner(taskInfo)

        minimizeTaskInner(taskInfo, minimizeReason)

    }



    private fun minimizeTaskInner(taskInfo: RunningTaskInfo) {

    private fun minimizeTaskInner(taskInfo: RunningTaskInfo, minimizeReason: MinimizeReason) {

        val taskId = taskInfo.taskId

        val displayId = taskInfo.displayId

        val wct = WindowContainerTransaction()
@@ -666,6 +673,7 @@ class DesktopTasksController( 
                transition = transition,

                displayId = displayId,

                taskId = taskId,

                minimizeReason = minimizeReason,

            )

        }

        exitResult.asExit()?.runOnTransitionStart?.invoke(transition)
@@ -821,7 +829,7 @@ class DesktopTasksController( 
                    minimizingTaskId = taskIdToMinimize,

                    exitingImmersiveTask = exitImmersiveResult.asExit()?.exitingTask,

                )

            taskIdToMinimize?.let { addPendingMinimizeTransition(t, it) }

            taskIdToMinimize?.let { addPendingMinimizeTransition(t, it, MinimizeReason.TASK_LIMIT) }

            exitImmersiveResult.asExit()?.runOnTransitionStart?.invoke(t)

            return t

        }
@@ -841,7 +849,7 @@ class DesktopTasksController( 
            )

        val t = transitions.startTransition(transitionType, wct, remoteTransitionHandler)

        remoteTransitionHandler.setTransition(t)

        taskIdToMinimize.let { addPendingMinimizeTransition(t, it) }

        taskIdToMinimize.let { addPendingMinimizeTransition(t, it, MinimizeReason.TASK_LIMIT) }

        exitImmersiveResult.asExit()?.runOnTransitionStart?.invoke(t)

        return t

    }
@@ -1844,7 +1852,7 @@ class DesktopTasksController( 
        val taskIdToMinimize = addAndGetMinimizeChanges(task.displayId, wct, task.taskId)

        addPendingAppLaunchTransition(transition, task.taskId, taskIdToMinimize)

        if (taskIdToMinimize != null) {

            addPendingMinimizeTransition(transition, taskIdToMinimize)

            addPendingMinimizeTransition(transition, taskIdToMinimize, MinimizeReason.TASK_LIMIT)

            return wct

        }

        if (!wct.isEmpty) {
@@ -1878,7 +1886,9 @@ class DesktopTasksController( 
                // Desktop Mode is already showing and we're launching a new Task - we might need to

                // minimize another Task.

                val taskIdToMinimize = addAndGetMinimizeChanges(task.displayId, wct, task.taskId)

                taskIdToMinimize?.let { addPendingMinimizeTransition(transition, it) }

                taskIdToMinimize?.let {

                    addPendingMinimizeTransition(transition, it, MinimizeReason.TASK_LIMIT)

                }

                addPendingAppLaunchTransition(transition, task.taskId, taskIdToMinimize)

                desktopImmersiveController.exitImmersiveIfApplicable(

                    transition,
@@ -2126,13 +2136,18 @@ class DesktopTasksController( 
            .addAndGetMinimizeTaskChanges(displayId, wct, newTaskId, launchingNewIntent)

    }



    private fun addPendingMinimizeTransition(transition: IBinder, taskIdToMinimize: Int) {

    private fun addPendingMinimizeTransition(

        transition: IBinder,

        taskIdToMinimize: Int,

        minimizeReason: MinimizeReason,

    ) {

        val taskToMinimize = shellTaskOrganizer.getRunningTaskInfo(taskIdToMinimize)

        desktopTasksLimiter.ifPresent {

            it.addPendingMinimizeChange(

                transition = transition,

                displayId = taskToMinimize?.displayId ?: DEFAULT_DISPLAY,

                taskId = taskIdToMinimize,

                minimizeReason = minimizeReason,

            )

        }

    }