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

Commit 3bc46e62 authored by Anushree Ganjam's avatar Anushree Ganjam
Browse files

Remove all CUJ constants defined in InteractionJankMonitorWrapper. 

Update the launcher code to use constants defined in Cuj.java directly.

Bug: 303105164
Test: Manual
Flag: NA
Change-Id: I9f353c40bdd5df0f6cf05e2ad7b8fbf3c4fdf755
parent 99b3bb76

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

+5 −53
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.shared.system;



import android.annotation.IntDef;

import android.os.Build;

import android.text.TextUtils;

import android.view.View;
@@ -25,61 +24,14 @@ import com.android.internal.jank.Cuj; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.jank.InteractionJankMonitor.Configuration;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;



public final class InteractionJankMonitorWrapper {

    // Launcher journeys.

    public static final int CUJ_APP_LAUNCH_FROM_RECENTS = Cuj.CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS;

    public static final int CUJ_APP_LAUNCH_FROM_ICON = Cuj.CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON;

    public static final int CUJ_APP_CLOSE_TO_HOME = Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME;

    public static final int CUJ_APP_CLOSE_TO_HOME_FALLBACK =

            Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK;

    public static final int CUJ_APP_CLOSE_TO_PIP = Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_PIP;

    public static final int CUJ_QUICK_SWITCH = Cuj.CUJ_LAUNCHER_QUICK_SWITCH;

    public static final int CUJ_OPEN_ALL_APPS = Cuj.CUJ_LAUNCHER_OPEN_ALL_APPS;

    public static final int CUJ_CLOSE_ALL_APPS_SWIPE = Cuj.CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE;

    public static final int CUJ_CLOSE_ALL_APPS_TO_HOME = Cuj.CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME;

    public static final int CUJ_ALL_APPS_SCROLL = Cuj.CUJ_LAUNCHER_ALL_APPS_SCROLL;

    public static final int CUJ_APP_LAUNCH_FROM_WIDGET = Cuj.CUJ_LAUNCHER_APP_LAUNCH_FROM_WIDGET;

    public static final int CUJ_SPLIT_SCREEN_ENTER = Cuj.CUJ_SPLIT_SCREEN_ENTER;

    public static final int CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION =

            Cuj.CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;

    public static final int CUJ_RECENTS_SCROLLING = Cuj.CUJ_RECENTS_SCROLLING;

    public static final int CUJ_APP_SWIPE_TO_RECENTS = Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS;

    public static final int CUJ_OPEN_SEARCH_RESULT = Cuj.CUJ_LAUNCHER_OPEN_SEARCH_RESULT;

    public static final int CUJ_LAUNCHER_UNFOLD_ANIM = Cuj.CUJ_LAUNCHER_UNFOLD_ANIM;

    public static final int CUJ_SEARCH_QSB_OPEN = Cuj.CUJ_LAUNCHER_SEARCH_QSB_OPEN;



    @IntDef({

            CUJ_APP_LAUNCH_FROM_RECENTS,

            CUJ_APP_LAUNCH_FROM_ICON,

            CUJ_APP_CLOSE_TO_HOME,

            CUJ_APP_CLOSE_TO_HOME_FALLBACK,

            CUJ_APP_CLOSE_TO_PIP,

            CUJ_QUICK_SWITCH,

            CUJ_APP_LAUNCH_FROM_WIDGET,

            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            CUJ_RECENTS_SCROLLING,

            CUJ_APP_SWIPE_TO_RECENTS,

            CUJ_OPEN_ALL_APPS,

            CUJ_CLOSE_ALL_APPS_SWIPE,

            CUJ_CLOSE_ALL_APPS_TO_HOME,

            CUJ_OPEN_SEARCH_RESULT,

            CUJ_LAUNCHER_UNFOLD_ANIM,

            CUJ_SEARCH_QSB_OPEN,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {

    }



    /**

     * Begin a trace session.

     *

     * @param v       an attached view.

     * @param cujType the specific {@link Cuj.CujType}.

     */

    public static void begin(View v, @CujType int cujType) {

    public static void begin(View v, @Cuj.CujType int cujType) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;

        InteractionJankMonitor.getInstance().begin(v, cujType);

    }
@@ -91,7 +43,7 @@ public final class InteractionJankMonitorWrapper { 
     * @param cujType the specific {@link Cuj.CujType}.

     * @param timeout duration to cancel the instrumentation in ms

     */

    public static void begin(View v, @CujType int cujType, long timeout) {

    public static void begin(View v, @Cuj.CujType int cujType, long timeout) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;

        Configuration.Builder builder =

                Configuration.Builder.withView(cujType, v)
@@ -106,7 +58,7 @@ public final class InteractionJankMonitorWrapper { 
     * @param cujType the specific {@link Cuj.CujType}.

     * @param tag the tag to distinguish different flow of same type CUJ.

     */

    public static void begin(View v, @CujType int cujType, String tag) {

    public static void begin(View v, @Cuj.CujType int cujType, String tag) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;

        Configuration.Builder builder =

                Configuration.Builder.withView(cujType, v);
@@ -121,7 +73,7 @@ public final class InteractionJankMonitorWrapper { 
     *

     * @param cujType the specific {@link Cuj.CujType}.

     */

    public static void end(@CujType int cujType) {

    public static void end(@Cuj.CujType int cujType) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;

        InteractionJankMonitor.getInstance().end(cujType);

    }
@@ -129,7 +81,7 @@ public final class InteractionJankMonitorWrapper { 
    /**

     * Cancel the trace session.

     */

    public static void cancel(@CujType int cujType) {

    public static void cancel(@Cuj.CujType int cujType) {

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return;

        InteractionJankMonitor.getInstance().cancel(cujType);

    }