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

Commit 9e98c4f7 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Add CUJ instrumentation for KQS"" into main

parents ba0adf80 4f98c9a6

core/java/com/android/internal/jank/Cuj.java

+22 −2
Original line number Diff line number Diff line
@@ -188,9 +188,17 @@ public class Cuj { 
     */

    public static final int CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU = 112;



    /** Track Launcher Keyboard Quick Switch View opening animation */

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN = 113;



    /** Track Launcher Keyboard Quick Switch View closing animation */

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE = 114;



    /** Track launching an app through the Launcher Keyboard Quick Switch View */

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH = 115;



    // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.

    @VisibleForTesting static final int LAST_CUJ = CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU;

    @VisibleForTesting static final int LAST_CUJ = CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;



    /** @hide */

    @IntDef({
@@ -294,7 +302,10 @@ public class Cuj { 
            CUJ_DESKTOP_MODE_EXIT_MODE,

            CUJ_DESKTOP_MODE_MINIMIZE_WINDOW,

            CUJ_DESKTOP_MODE_DRAG_WINDOW,

            CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP

            CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP,

            CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN,

            CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE,

            CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {}
@@ -409,6 +420,9 @@ public class Cuj { 
        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_MINIMIZE_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_MINIMIZE_WINDOW;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_DRAG_WINDOW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_DRAG_WINDOW;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;

    }



    private Cuj() {
@@ -629,6 +643,12 @@ public class Cuj { 
                return "DESKTOP_MODE_DRAG_WINDOW";

            case CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP:

                return "STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP";

            case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN:

                return "LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN";

            case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE:

                return "LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE";

            case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH:

                return "LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH";

        }

        return "UNKNOWN";

    }