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

Commit 04bbd59b authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Add App Icon from overview as an EnterReason in logs 

Test: updated unit tests
Bug: b/344822506
Flag: EXEMPT minor change, not a feature
Change-Id: I4474dd7d21464714919f7efab6270761c6909406
parent d5adf387

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

+4 −1
Original line number Diff line number Diff line
@@ -187,7 +187,10 @@ class DesktopModeEventLogger { 
            KEYBOARD_SHORTCUT_ENTER(

                FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__KEYBOARD_SHORTCUT_ENTER

            ),

            SCREEN_ON(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__SCREEN_ON)

            SCREEN_ON(FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__SCREEN_ON),

            APP_FROM_OVERVIEW(

                FrameworkStatsLog.DESKTOP_MODE_UICHANGED__ENTER_REASON__APP_FROM_OVERVIEW

            ),

        }



        /**

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

+1 −2
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ class DesktopModeLoggerTransitionObserver( 
            WindowManager.TRANSIT_WAKE -> EnterReason.SCREEN_ON

            Transitions.TRANSIT_DESKTOP_MODE_END_DRAG_TO_DESKTOP -> EnterReason.APP_HANDLE_DRAG

            TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON -> EnterReason.APP_HANDLE_MENU_BUTTON

            // TODO(b/344822506): Create and update EnterReason to APP_FROM_OVERVIEW

            TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW -> EnterReason.UNKNOWN_ENTER

            TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW -> EnterReason.APP_FROM_OVERVIEW

            TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT -> EnterReason.KEYBOARD_SHORTCUT_ENTER

            WindowManager.TRANSIT_OPEN -> EnterReason.APP_FREEFORM_INTENT

            else -> EnterReason.UNKNOWN_ENTER

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

+1 −2
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ class DesktopModeLoggerTransitionObserverTest { 
    }



    @Test

    // TODO(b/344822506): Update test when we add enter reason for app from overview

    fun transitEnterDesktopFromAppFromOverview_logTaskAddedAndEnterReasonUnknown() {

        val change = createChange(TRANSIT_TO_FRONT, createTaskInfo(1, WINDOWING_MODE_FREEFORM))

        val transitionInfo =
@@ -200,7 +199,7 @@ class DesktopModeLoggerTransitionObserverTest { 


        assertThat(sessionId).isNotNull()

        verify(desktopModeEventLogger, times(1))

            .logSessionEnter(eq(sessionId!!), eq(EnterReason.UNKNOWN_ENTER))

            .logSessionEnter(eq(sessionId!!), eq(EnterReason.APP_FROM_OVERVIEW))

        verify(desktopModeEventLogger, times(1)).logTaskAdded(eq(sessionId), any())

        verifyZeroInteractions(desktopModeEventLogger)

    }