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

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

Merge "Log TASK_MOVED_TO_BACK when the desktop windowing exit with transition... 

Merge "Log TASK_MOVED_TO_BACK when the desktop windowing exit with transition info TRANSIT_TO_BACK" into main
parents 677f48ab 9114e787

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

+3 −0
Original line number Diff line number Diff line
@@ -541,6 +541,9 @@ class DesktopModeEventLogger { 
            TASK_FINISHED(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__EXIT_REASON__TASK_FINISHED),

            SCREEN_OFF(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__EXIT_REASON__SCREEN_OFF),

            TASK_MINIMIZED(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__EXIT_REASON__TASK_MINIMIZED),

            TASK_MOVED_TO_BACK(

                FrameworkStatsLog.DESKTOP_MODE_UICHANGED__EXIT_REASON__TASK_MOVED_TO_BACK

            ),

        }



        /**

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

+5 −0
Original line number Diff line number Diff line
@@ -404,12 +404,17 @@ class DesktopModeLoggerTransitionObserver( 
                wasPreviousTransitionExitByScreenOff = true

                ExitReason.SCREEN_OFF

            }

            // TODO(b/384490301): differentiate back gesture / button exit from clicking the close

            // button located in the window top corner.

            transitionInfo.type == WindowManager.TRANSIT_TO_BACK -> ExitReason.TASK_MOVED_TO_BACK

            transitionInfo.type == WindowManager.TRANSIT_CLOSE -> ExitReason.TASK_FINISHED

            transitionInfo.type == TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG -> ExitReason.DRAG_TO_EXIT

            transitionInfo.type == TRANSIT_EXIT_DESKTOP_MODE_HANDLE_MENU_BUTTON ->

                ExitReason.APP_HANDLE_MENU_BUTTON_EXIT



            transitionInfo.type == TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT ->

                ExitReason.KEYBOARD_SHORTCUT_EXIT



            transitionInfo.isExitToRecentsTransition() -> ExitReason.RETURN_HOME_OR_OVERVIEW

            transitionInfo.type == Transitions.TRANSIT_MINIMIZE -> ExitReason.TASK_MINIMIZED

            else -> {

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

+14 −0
Original line number Diff line number Diff line
@@ -508,6 +508,20 @@ class DesktopModeLoggerTransitionObserverTest : ShellTestCase() { 
        verifyTaskRemovedAndExitLogging(ExitReason.KEYBOARD_SHORTCUT_EXIT, DEFAULT_TASK_UPDATE)

    }



    @Test

    fun transitExitBackGesture_logTaskRemovedAndExitReasonTaskMovedToBack() {

        // add a freeform task

        transitionObserver.addTaskInfosToCachedMap(createTaskInfo(WINDOWING_MODE_FREEFORM))

        transitionObserver.isSessionActive = true



        // task moved to back

        val change = createChange(TRANSIT_TO_BACK, createTaskInfo(WINDOWING_MODE_FREEFORM))

        val transitionInfo = TransitionInfoBuilder(TRANSIT_TO_BACK).addChange(change).build()

        callOnTransitionReady(transitionInfo)



        verifyTaskRemovedAndExitLogging(ExitReason.TASK_MOVED_TO_BACK, DEFAULT_TASK_UPDATE)

    }



    @Test

    fun transitExitDesktopUnknown_logTaskRemovedAndExitReasonUnknown() {

        // add a freeform task