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

Commit 076056fa authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Add lock/unlock CUJs to java files" into main

parents a2e775d3 577e6858

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

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

    public static final int CUJ_LAUNCHER_PRIVATE_SPACE_LOCK = 102;

    public static final int CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK = 103;



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

    static final int LAST_CUJ = CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK;



    /** @hide */

    @IntDef({
@@ -230,7 +232,9 @@ public class Cuj { 
            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

            CUJ_LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK,

            CUJ_LAUNCHER_PRIVATE_SPACE_LOCK,

            CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -335,6 +339,8 @@ public class Cuj { 
        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;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_PRIVATE_SPACE_LOCK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_PRIVATE_SPACE_LOCK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_PRIVATE_SPACE_UNLOCK;

    }



    private Cuj() {
@@ -533,6 +539,10 @@ public class Cuj { 
                return "LAUNCHER_WIDGET_BOTTOM_SHEET_CLOSE_BACK";

            case CUJ_LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK:

                return "LAUNCHER_WIDGET_EDU_SHEET_CLOSE_BACK";

            case CUJ_LAUNCHER_PRIVATE_SPACE_LOCK:

                return "LAUNCHER_PRIVATE_SPACE_LOCK";

            case CUJ_LAUNCHER_PRIVATE_SPACE_UNLOCK:

                return "LAUNCHER_PRIVATE_SPACE_UNLOCK";

        }

        return "UNKNOWN";

    }