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

Commit 976301dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev am: 98ed521f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d84c4e8b2ca113bcb59030c497b13f5edc84477
parents 8b6286ee 98ed521f

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

+12 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ package com.android.internal.jank; 


import static com.android.internal.jank.FrameTracker.ChoreographerWrapper;

import static com.android.internal.jank.FrameTracker.SurfaceControlWrapper;

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

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

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_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;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PASSWORD_DISAPPEAR;
@@ -114,6 +116,8 @@ public class InteractionJankMonitor { 
    public static final int CUJ_LOCKSCREEN_PIN_DISAPPEAR = 22;

    public static final int CUJ_LOCKSCREEN_TRANSITION_FROM_AOD = 23;

    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;



    private static final int NO_STATSD_LOGGING = -1;
@@ -147,6 +151,8 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PIN_DISAPPEAR,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_TRANSITION_FROM_AOD,

            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,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -191,6 +197,8 @@ public class InteractionJankMonitor { 
            CUJ_LOCKSCREEN_PIN_DISAPPEAR,

            CUJ_LOCKSCREEN_TRANSITION_FROM_AOD,

            CUJ_LOCKSCREEN_TRANSITION_TO_AOD,

            CUJ_LAUNCHER_OPEN_ALL_APPS,

            CUJ_LAUNCHER_ALL_APPS_SCROLL,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -457,6 +465,10 @@ public class InteractionJankMonitor { 
                return "CUJ_LOCKSCREEN_TRANSITION_FROM_AOD";

            case CUJ_LOCKSCREEN_TRANSITION_TO_AOD:

                return "CUJ_LOCKSCREEN_TRANSITION_TO_AOD";

            case CUJ_LAUNCHER_OPEN_ALL_APPS :

                return "CUJ_LAUNCHER_OPEN_ALL_APPS";

            case CUJ_LAUNCHER_ALL_APPS_SCROLL:

                return "CUJ_LAUNCHER_ALL_APPS_SCROLL";

        }

        return "UNKNOWN";

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.shared.system;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.view.View;



import com.android.internal.jank.InteractionJankMonitor;
@@ -37,6 +36,10 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_PIP;

    public static final int CUJ_QUICK_SWITCH =

            InteractionJankMonitor.CUJ_LAUNCHER_QUICK_SWITCH;

    public static final int CUJ_OPEN_ALL_APPS =

            InteractionJankMonitor.CUJ_LAUNCHER_OPEN_ALL_APPS;

    public static final int CUJ_ALL_APPS_SCROLL =

            InteractionJankMonitor.CUJ_LAUNCHER_ALL_APPS_SCROLL;



    @IntDef({

            CUJ_APP_LAUNCH_FROM_RECENTS,