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

Commit e8d8c8ef authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Add jank monitoring for taskbar appearing and disappearing" into tm-qpr-dev am: 0180bb59 

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



Change-Id: Iba25ae8912465d339211162aba000740093a1328
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26b3de81 0180bb59

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

+12 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS;

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

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

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;
@@ -206,6 +208,8 @@ public class InteractionJankMonitor { 
    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;

    public static final int CUJ_TASKBAR_EXPAND = 60;

    public static final int CUJ_TASKBAR_COLLAPSE = 61;



    private static final int NO_STATSD_LOGGING = -1;
@@ -274,6 +278,8 @@ public class InteractionJankMonitor { 
            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,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TASKBAR_EXPAND,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__TASKBAR_COLLAPSE,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -354,6 +360,8 @@ public class InteractionJankMonitor { 
            CUJ_SETTINGS_TOGGLE,

            CUJ_SHADE_DIALOG_OPEN,

            CUJ_USER_DIALOG_OPEN,

            CUJ_TASKBAR_EXPAND,

            CUJ_TASKBAR_COLLAPSE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -792,6 +800,10 @@ public class InteractionJankMonitor { 
                return "SHADE_DIALOG_OPEN";

            case CUJ_USER_DIALOG_OPEN:

                return "USER_DIALOG_OPEN";

            case CUJ_TASKBAR_EXPAND:

                return "TASKBAR_EXPAND";

            case CUJ_TASKBAR_COLLAPSE:

                return "TASKBAR_COLLAPSE";

        }

        return "UNKNOWN";

    }