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

Commit b2d4779d authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Add workUtilityView expand/shrink CUJs to cuj.java" into main

parents 2b1f19d9 03bf00fb

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

+16 −3
Original line number Diff line number Diff line
@@ -300,9 +300,14 @@ public class Cuj { 
     */

    public static final int CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH = 125;



    /** Track work utility view animation expanding when scrolling up app list. */

    public static final int CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND = 126;



    /** Track work utility view animation shrinking when scrolling down app list. */

    public static final int CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK = 127;



    // 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_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;

    @VisibleForTesting static final int LAST_CUJ = CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK;



    /** @hide */

    @IntDef({
@@ -419,7 +424,9 @@ public class Cuj { 
            CUJ_DESKTOP_MODE_CLOSE_TASK,

            CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT,

            CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON,

            CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH

            CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {}
@@ -547,6 +554,8 @@ public class Cuj { 
        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_INTENT] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_APP_LAUNCH_FROM_INTENT;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_APP_LAUNCH_FROM_ICON] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_APP_LAUNCH_FROM_ICON;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WORK_UTILITY_VIEW_EXPAND;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WORK_UTILITY_VIEW_SHRINK;

    }



    private Cuj() {
@@ -793,6 +802,10 @@ public class Cuj { 
                return "DESKTOP_MODE_APP_LAUNCH_FROM_ICON";

            case CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH:

                return "DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH";

            case CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND:

                return "LAUNCHER_WORK_UTILITY_VIEW_EXPAND";

            case CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK:

                return "LAUNCHER_WORK_UTILITY_VIEW_SHRINK";

        }

        return "UNKNOWN";

    }