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

Commit f0f05520 authored by Yanting Yang's avatar Yanting Yang Committed by Automerger Merge Worker
Browse files

Merge "Add Settings page scroll CUJ to InteractionJankMonitor" into sc-dev am: 8cd70e05 

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

Change-Id: Iad3e8eb4f542c1df22c7686b1a0ac85d43893b6b
parents 99fdf3b8 8cd70e05

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

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

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

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

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

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

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;
@@ -146,6 +147,7 @@ public class InteractionJankMonitor { 
    public static final int CUJ_LAUNCHER_OPEN_ALL_APPS = 25;

    public static final int CUJ_LAUNCHER_ALL_APPS_SCROLL = 26;

    public static final int CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET = 27;

    public static final int CUJ_SETTINGS_PAGE_SCROLL = 28;



    private static final int NO_STATSD_LOGGING = -1;
@@ -182,6 +184,7 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_ALL_APPS_SCROLL,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_LAUNCH_FROM_WIDGET,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SETTINGS_PAGE_SCROLL,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -229,6 +232,7 @@ public class InteractionJankMonitor { 
            CUJ_LAUNCHER_OPEN_ALL_APPS,

            CUJ_LAUNCHER_ALL_APPS_SCROLL,

            CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET,

            CUJ_SETTINGS_PAGE_SCROLL,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -543,6 +547,8 @@ public class InteractionJankMonitor { 
                return "CUJ_LAUNCHER_ALL_APPS_SCROLL";

            case CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET:

                return "LAUNCHER_APP_LAUNCH_FROM_WIDGET";

            case CUJ_SETTINGS_PAGE_SCROLL:

                return "SETTINGS_PAGE_SCROLL";

        }

        return "UNKNOWN";

    }