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

Commit 2f8402e6 authored by Mike Schneider's avatar Mike Schneider Committed by Automerger Merge Worker
Browse files

Merge "Add enum entries for HADE_DIALOG_OPEN and USER_DIALOG_OPEN... 

Merge "Add enum entries for HADE_DIALOG_OPEN and USER_DIALOG_OPEN interactions" into tm-qpr-dev am: 2b75a240

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581264



Change-Id: Icfb9fc05c90bbf18a61b8d8273d7230b9d1504f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5dd12480 2b75a240

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

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_MEDIA_PLAYER;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_QS_TILE;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_DIALOG_OPEN;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_COLLAPSE_LOCK;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_APPEAR;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_DISAPPEAR;
@@ -75,6 +76,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TAKE_SCREENSHOT;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_DIALOG_OPEN;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_SWITCH;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WALLPAPER_TRANSITION;
@@ -202,6 +204,8 @@ public class InteractionJankMonitor { 
    public static final int CUJ_VOLUME_CONTROL = 55;

    public static final int CUJ_BIOMETRIC_PROMPT_TRANSITION = 56;

    public static final int CUJ_SETTINGS_TOGGLE = 57;

    public static final int CUJ_SHADE_DIALOG_OPEN = 58;

    public static final int CUJ_USER_DIALOG_OPEN = 59;



    private static final int NO_STATSD_LOGGING = -1;
@@ -268,6 +272,8 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__VOLUME_CONTROL,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__BIOMETRIC_PROMPT_TRANSITION,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SETTINGS_TOGGLE,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_DIALOG_OPEN,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_DIALOG_OPEN,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -346,6 +352,8 @@ public class InteractionJankMonitor { 
            CUJ_VOLUME_CONTROL,

            CUJ_BIOMETRIC_PROMPT_TRANSITION,

            CUJ_SETTINGS_TOGGLE,

            CUJ_SHADE_DIALOG_OPEN,

            CUJ_USER_DIALOG_OPEN,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -780,6 +788,10 @@ public class InteractionJankMonitor { 
                return "BIOMETRIC_PROMPT_TRANSITION";

            case CUJ_SETTINGS_TOGGLE:

                return "SETTINGS_TOGGLE";

            case CUJ_SHADE_DIALOG_OPEN:

                return "SHADE_DIALOG_OPEN";

            case CUJ_USER_DIALOG_OPEN:

                return "USER_DIALOG_OPEN";

        }

        return "UNKNOWN";

    }