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

Commit 55fe1e32 authored by Cyrus Boadway's avatar Cyrus Boadway Committed by Automerger Merge Worker
Browse files

Merge "Add Widget CUJ parameter to jank monitoring" into sc-dev am: 01cd8a9d 

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

Change-Id: I466fc50b4caeb199ca0802ab34ff870a6e21d539
parents 17045b56 01cd8a9d

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

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

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

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

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

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

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

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PASSWORD_APPEAR;
@@ -144,6 +145,7 @@ public class InteractionJankMonitor { 
    public static final int CUJ_LOCKSCREEN_TRANSITION_TO_AOD = 24;

    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;



    private static final int NO_STATSD_LOGGING = -1;
@@ -179,6 +181,7 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_TRANSITION_TO_AOD,

            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,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -225,6 +228,7 @@ public class InteractionJankMonitor { 
            CUJ_LOCKSCREEN_TRANSITION_TO_AOD,

            CUJ_LAUNCHER_OPEN_ALL_APPS,

            CUJ_LAUNCHER_ALL_APPS_SCROLL,

            CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -537,6 +541,8 @@ public class InteractionJankMonitor { 
                return "CUJ_LAUNCHER_OPEN_ALL_APPS";

            case CUJ_LAUNCHER_ALL_APPS_SCROLL:

                return "CUJ_LAUNCHER_ALL_APPS_SCROLL";

            case CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET:

                return "LAUNCHER_APP_LAUNCH_FROM_WIDGET";

        }

        return "UNKNOWN";

    }

packages/SystemUI/shared/src/com/android/systemui/shared/system/InteractionJankMonitorWrapper.java

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_LAUNCHER_OPEN_ALL_APPS;

    public static final int CUJ_ALL_APPS_SCROLL =

            InteractionJankMonitor.CUJ_LAUNCHER_ALL_APPS_SCROLL;

    public static final int CUJ_APP_LAUNCH_FROM_WIDGET =

            InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET;



    @IntDef({

            CUJ_APP_LAUNCH_FROM_RECENTS,
@@ -47,6 +49,7 @@ public final class InteractionJankMonitorWrapper { 
            CUJ_APP_CLOSE_TO_HOME,

            CUJ_APP_CLOSE_TO_PIP,

            CUJ_QUICK_SWITCH,

            CUJ_APP_LAUNCH_FROM_WIDGET,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {