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

Commit 64820d11 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Add CUJ instrumentation for KQS 

Flag: NONE LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Bug: 339585624
Test: manually checked that CUJ calls were reached
Change-Id: I549e52c35dbe5c5d5cc857fb92a3dd1fbe7ecf8a
parent 68b0cef5

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

+22 −2
Original line number Diff line number Diff line
@@ -175,9 +175,17 @@ 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_STATUS_BAR_LAUNCH_DIALOG_FROM_CHIP;

    @VisibleForTesting static final int LAST_CUJ = CUJ_LAUNCHER_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;



    /** @hide */

    @IntDef({
@@ -280,7 +288,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 {}
@@ -394,6 +405,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() {
@@ -612,6 +626,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 "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";

    }