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

Commit 9c7a2efd authored by Fengjiang Li's avatar Fengjiang Li
Browse files

Add predictive back CUJ to java files 

Bug: 330405993
Test: NONE
Change-Id: I902fa8770832da515e2deda4617d7776de944d52
parent 65347a57

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

+36 −2
Original line number Diff line number Diff line
@@ -127,10 +127,17 @@ public class Cuj { 
    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;

    public static final int CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK = 95;

    public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK = 96;

    public static final int CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK = 97;

    public static final int CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK = 98;

    public static final int CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK = 99;

    public static final int CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK = 100;

    public static final int CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK = 101;



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

    static final int LAST_CUJ = CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK;



    /** @hide */

    @IntDef({
@@ -217,7 +224,13 @@ public class Cuj { 
            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

            CUJ_LAUNCHER_SAVE_APP_PAIR,

            CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK,

            CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK,

            CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK,

            CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK,

            CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK,

            CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -315,6 +328,13 @@ public class Cuj { 
        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;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_ALL_APPS_SEARCH_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_PICKER_CLOSE_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_PICKER_SEARCH_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK;

    }



    private Cuj() {
@@ -499,6 +519,20 @@ public class Cuj { 
                return "LAUNCHER_LAUNCH_APP_PAIR_FROM_TASKBAR";

            case CUJ_LAUNCHER_SAVE_APP_PAIR:

                return "LAUNCHER_SAVE_APP_PAIR";

            case CUJ_LAUNCHER_ALL_APPS_SEARCH_BACK:

                return "LAUNCHER_ALL_APPS_SEARCH_BACK";

            case CUJ_LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK:

                return "LAUNCHER_TASKBAR_ALL_APPS_CLOSE_BACK";

            case CUJ_LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK:

                return "LAUNCHER_TASKBAR_ALL_APPS_SEARCH_BACK";

            case CUJ_LAUNCHER_WIDGET_PICKER_CLOSE_BACK:

                return "LAUNCHER_WIDGET_PICKER_CLOSE_BACK";

            case CUJ_LAUNCHER_WIDGET_PICKER_SEARCH_BACK:

                return "LAUNCHER_WIDGET_PICKER_SEARCH_BACK";

            case CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK:

                return "LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK";

            case CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK:

                return "LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK";

        }

        return "UNKNOWN";

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -168,6 +168,13 @@ public class InteractionJankMonitor { 
    @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;

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

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

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

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

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

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

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



    private static class InstanceHolder {

        public static final InteractionJankMonitor INSTANCE =