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

Commit 145020e6 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Add CUJ constants for launching and saving App Pairs 

Bug: 328646540
Change-Id: I6dfeea5ed39ae865e5bed82615a1e7968b2ce762
Merged-In: I6dfeea5ed39ae865e5bed82615a1e7968b2ce762
parent 01cc4641

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

+16 −1
Original line number Diff line number Diff line
@@ -124,10 +124,13 @@ public class Cuj { 
    public static final int CUJ_BACK_PANEL_ARROW = 88;

    public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK = 89;

    public static final int CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH = 90;

    public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = 91;

    public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = 92;

    public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = 93;



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

    static final int LAST_CUJ = CUJ_LAUNCHER_SAVE_APP_PAIR;



    /** @hide */

    @IntDef({
@@ -212,6 +215,9 @@ public class Cuj { 
            CUJ_BACK_PANEL_ARROW,

            CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK,

            CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH,

            CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE,

            CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR,

            CUJ_LAUNCHER_SAVE_APP_PAIR

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -306,6 +312,9 @@ public class Cuj { 
        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_BACK_PANEL_ARROW] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BACK_PANEL_ARROW;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_CLOSE_ALL_APPS_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SEARCH_QSB_WEB_SEARCH;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_SAVE_APP_PAIR] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_SAVE_APP_PAIR;

    }



    private Cuj() {
@@ -484,6 +493,12 @@ public class Cuj { 
                return "LAUNCHER_CLOSE_ALL_APPS_BACK";

            case CUJ_LAUNCHER_SEARCH_QSB_WEB_SEARCH:

                return "LAUNCHER_SEARCH_QSB_WEB_SEARCH";

            case CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE:

                return "LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE";

            case CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR:

                return "LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR";

            case CUJ_LAUNCHER_SAVE_APP_PAIR:

                return "LAUNCHER_SAVE_APP_PAIR";

        }

        return "UNKNOWN";

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ public class InteractionJankMonitor { 
    @Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY = Cuj.CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY;

    @Deprecated public static final int CUJ_PREDICTIVE_BACK_CROSS_TASK = Cuj.CUJ_PREDICTIVE_BACK_CROSS_TASK;

    @Deprecated public static final int CUJ_PREDICTIVE_BACK_HOME = Cuj.CUJ_PREDICTIVE_BACK_HOME;

    @Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE;

    @Deprecated public static final int CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR = Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR;

    @Deprecated public static final int CUJ_LAUNCHER_SAVE_APP_PAIR = Cuj.CUJ_LAUNCHER_SAVE_APP_PAIR;



    private static class InstanceHolder {

        public static final InteractionJankMonitor INSTANCE =