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

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

Move exit-desktop on window-close CUJ to Launcher 

Move the CUJ to where the actual animation is taking place, so we can
target the correct surface/leash

Bug: 374214290
Flag: NONE jank logging
Test: manual

Change-Id: I057dd7d9269dcc9d78da1d6e3039f5d9c44a576e
parent 24109ce0

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

+0 −14
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.window.TransitionInfo.Change 
import android.window.TransitionRequestInfo

import android.window.WindowContainerTransaction

import androidx.annotation.VisibleForTesting

import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags
@@ -208,7 +207,6 @@ class DesktopMixedTransitionHandler( 
            return dispatchCloseLastDesktopTaskAnimation(

                transition,

                info,

                closeChange,

                startTransaction,

                finishTransaction,

                finishCallback,
@@ -352,18 +350,10 @@ class DesktopMixedTransitionHandler( 
    private fun dispatchCloseLastDesktopTaskAnimation(

        transition: IBinder,

        info: TransitionInfo,

        change: TransitionInfo.Change,

        startTransaction: SurfaceControl.Transaction,

        finishTransaction: SurfaceControl.Transaction,

        finishCallback: TransitionFinishCallback,

    ): Boolean {

        // Starting the jank trace if closing the last window in desktop mode.

        interactionJankMonitor.begin(

            change.leash,

            context,

            handler,

            CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE,

        )

        // Dispatch the last desktop task closing animation.

        return dispatchToLeftoverHandler(

            transition = transition,
@@ -371,10 +361,6 @@ class DesktopMixedTransitionHandler( 
            startTransaction = startTransaction,

            finishTransaction = finishTransaction,

            finishCallback = finishCallback,

            doOnFinishCallback = {

                // Finish the jank trace when closing the last window in desktop mode.

                interactionJankMonitor.end(CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE)

            },

        )

    }

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

+0 −8
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.window.TransitionInfo 
import android.window.WindowContainerToken

import android.window.WindowContainerTransaction

import androidx.test.filters.SmallTest

import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE

import com.android.internal.jank.InteractionJankMonitor

import com.android.window.flags.Flags

import com.android.wm.shell.RootTaskDisplayAreaOrganizer
@@ -266,13 +265,6 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
                any(),

                eq(mixedHandler),

            )

        verify(interactionJankMonitor)

            .begin(

                closingTaskLeash,

                context,

                mockHandler,

                CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE,

            )

    }



    @Test