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

Commit e2d3ce6c authored by Gustav Sennton's avatar Gustav Sennton
Browse files

[Desktop Windowing] Use Change leash for minimize animation CUJ 

Bug: 384638246
Test: DesktopTasksLimiterTest
Flag: com.android.window.flags.enable_desktop_windowing_task_limit
Change-Id: I189a27665672e6b754019820b20a72e1615c7511
parent 592611bd

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

+14 −8
Original line number Diff line number Diff line
@@ -127,15 +127,21 @@ class DesktopTasksLimiter( 


        override fun onTransitionStarting(transition: IBinder) {

            val mActiveTaskDetails = activeTransitionTokensAndTasks[transition]

            if (mActiveTaskDetails != null && mActiveTaskDetails.transitionInfo != null) {

            val info = mActiveTaskDetails?.transitionInfo ?: return

            val minimizeChange = getMinimizeChange(info, mActiveTaskDetails.taskId) ?: return

            // Begin minimize window CUJ instrumentation.

            interactionJankMonitor.begin(

                    mActiveTaskDetails.transitionInfo?.rootLeash,

                minimizeChange.leash,

                context,

                handler,

                CUJ_DESKTOP_MODE_MINIMIZE_WINDOW,

            )

        }



        private fun getMinimizeChange(info: TransitionInfo, taskId: Int): TransitionInfo.Change? {

            return info.changes.find { change ->

                change.taskInfo?.taskId == taskId && change.mode == TRANSIT_TO_BACK

            }

        }



        override fun onTransitionMerged(merged: IBinder, playing: IBinder) {

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

+3 −3
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
            .getTransitionObserver()

            .onTransitionReady(

                transition,

                TransitionInfoBuilder(TRANSIT_OPEN).build(),

                TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),

                StubTransaction() /* startTransaction */,

                StubTransaction(), /* finishTransaction */

            )
@@ -583,7 +583,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
            .getTransitionObserver()

            .onTransitionReady(

                transition,

                TransitionInfoBuilder(TRANSIT_OPEN).build(),

                TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),

                StubTransaction() /* startTransaction */,

                StubTransaction(), /* finishTransaction */

            )
@@ -616,7 +616,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
            .getTransitionObserver()

            .onTransitionReady(

                mergedTransition,

                TransitionInfoBuilder(TRANSIT_OPEN).build(),

                TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),

                StubTransaction() /* startTransaction */,

                StubTransaction(), /* finishTransaction */

            )