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

Commit 259321ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add CUJ_RECENTS_SCROLLING" into tm-qpr-dev

parents ac09efc0 c75bae06

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

+7 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__ONE_HANDED_ENTER_TRANSITION;

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

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

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

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

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

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SETTINGS_PAGE_SCROLL;
@@ -223,6 +224,7 @@ public class InteractionJankMonitor { 
    public static final int CUJ_SHADE_CLEAR_ALL = 62;

    public static final int CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION = 63;

    public static final int CUJ_LOCKSCREEN_OCCLUSION = 64;

    public static final int CUJ_RECENTS_SCROLLING = 65;



    private static final int NO_STATSD_LOGGING = -1;
@@ -296,6 +298,7 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_CLEAR_ALL,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_OCCLUSION,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__RECENTS_SCROLLING,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -380,7 +383,8 @@ public class InteractionJankMonitor { 
            CUJ_TASKBAR_COLLAPSE,

            CUJ_SHADE_CLEAR_ALL,

            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            CUJ_LOCKSCREEN_OCCLUSION

            CUJ_LOCKSCREEN_OCCLUSION,

            CUJ_RECENTS_SCROLLING

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -893,6 +897,8 @@ public class InteractionJankMonitor { 
                return "LAUNCHER_UNLOCK_ENTRANCE_ANIMATION";

            case CUJ_LOCKSCREEN_OCCLUSION:

                return "LOCKSCREEN_OCCLUSION";

            case CUJ_RECENTS_SCROLLING:

                return "RECENTS_SCROLLING";

        }

        return "UNKNOWN";

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_SPLIT_SCREEN_ENTER;

    public static final int CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION =

            InteractionJankMonitor.CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;

    public static final int CUJ_RECENTS_SCROLLING =

            InteractionJankMonitor.CUJ_RECENTS_SCROLLING;



    @IntDef({

            CUJ_APP_LAUNCH_FROM_RECENTS,
@@ -59,7 +61,8 @@ public final class InteractionJankMonitorWrapper { 
            CUJ_APP_CLOSE_TO_PIP,

            CUJ_QUICK_SWITCH,

            CUJ_APP_LAUNCH_FROM_WIDGET,

            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION

            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            CUJ_RECENTS_SCROLLING

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {