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

Commit c804cc50 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

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

parents 8c351135 d989306c

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

+2 −22
Original line number Diff line number Diff line
@@ -175,17 +175,9 @@ public class Cuj { 
    /** Track launching a dialog from a status bar chip. */

    public static final int CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP = 111;



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

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN = 112;



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

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE = 113;



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

    public static final int CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH = 114;



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

    @VisibleForTesting static final int LAST_CUJ = CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;

    @VisibleForTesting static final int LAST_CUJ = CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP;



    /** @hide */

    @IntDef({
@@ -288,10 +280,7 @@ 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_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN,

            CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE,

            CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH

            CUJ_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {}
@@ -405,9 +394,6 @@ 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() {
@@ -626,12 +612,6 @@ 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 "CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_OPEN";

            case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE:

                return "CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_CLOSE";

            case CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH:

                return "CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH";

        }

        return "UNKNOWN";

    }