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

Commit 8522c88e authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Add more logs to DesktopMixedTransitionHandler and DesktopTasksLimiter 

Test: manual
Bug: 406198680
Flag: EXEMPT debug logs
Change-Id: I7e1126d5c0f0df1e310396c22476d534fc460911
parent 57e0889e

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

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ class DesktopMixedTransitionHandler( 
            logW("Should have closing desktop task")

            return false

        }

        logV("Animating mixed close transition task#%s", closeChange.taskInfo?.taskId)

        if (isWallpaperActivityClosing(info)) {

            // If the wallpaper activity is closing then the desktop is closing, animate the closing

            // desktop by dispatching to other transition handlers.
@@ -327,6 +328,7 @@ class DesktopMixedTransitionHandler( 
                DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue

            }

        if (!shouldAnimate) {

            logV("Not animating pending minimize transition")

            return false

        }
@@ -335,6 +337,7 @@ class DesktopMixedTransitionHandler( 
            logW("Should have minimizing desktop task")

            return false

        }

        logV("Animating mixed minimize transition task#%s", minimizeChange.taskInfo?.taskId)

        if (pending.isLastTask) {

            // Dispatch close desktop task animation to the default transition handlers.

            return dispatchToLeftoverHandler(

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

+9 −2
Original line number Diff line number Diff line
@@ -338,8 +338,15 @@ class DesktopTasksLimiter( 
        launchingNewIntent: Boolean,

    ): Int? {

        val newTasksOpening = if (launchingNewIntent) 1 else 0

        if (visibleOrderedTasks.size + newTasksOpening <= (maxTasksLimit ?: Int.MAX_VALUE)) {

            logV("No need to minimize; tasks below limit")

        val taskLimit = (maxTasksLimit ?: Int.MAX_VALUE)

        if (visibleOrderedTasks.size + newTasksOpening <= taskLimit) {

            logV(

                "No need to minimize; tasks below limit, " +

                    " visible tasks: %s, new task: %s, task limit: %s",

                visibleOrderedTasks,

                launchingNewIntent,

                taskLimit,

            )

            // No need to minimize anything

            return null

        }