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

Commit a48a1477 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Defining CUJ_APP_CLOSE_TO_HOME_FALLBACK" into udc-qpr-dev am: 3f1e7afe 

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



Change-Id: Ia19dd4f505441ac93e75dda724644a1e2129451f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96c62e95 3f1e7afe

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;





public final class InteractionJankMonitorWrapper {

public final class InteractionJankMonitorWrapper {

    private static final String TAG = "JankMonitorWrapper";



    // Launcher journeys.

    // Launcher journeys.

    public static final int CUJ_APP_LAUNCH_FROM_RECENTS =

    public static final int CUJ_APP_LAUNCH_FROM_RECENTS =

            InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS;

            InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_RECENTS;
@@ -37,6 +35,8 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON;

            InteractionJankMonitor.CUJ_LAUNCHER_APP_LAUNCH_FROM_ICON;

    public static final int CUJ_APP_CLOSE_TO_HOME =

    public static final int CUJ_APP_CLOSE_TO_HOME =

            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_HOME;

            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_HOME;

    public static final int CUJ_APP_CLOSE_TO_HOME_FALLBACK =

            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK;

    public static final int CUJ_APP_CLOSE_TO_PIP =

    public static final int CUJ_APP_CLOSE_TO_PIP =

            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_PIP;

            InteractionJankMonitor.CUJ_LAUNCHER_APP_CLOSE_TO_PIP;

    public static final int CUJ_QUICK_SWITCH =

    public static final int CUJ_QUICK_SWITCH =
@@ -68,6 +68,7 @@ public final class InteractionJankMonitorWrapper { 
            CUJ_APP_LAUNCH_FROM_RECENTS,

            CUJ_APP_LAUNCH_FROM_RECENTS,

            CUJ_APP_LAUNCH_FROM_ICON,

            CUJ_APP_LAUNCH_FROM_ICON,

            CUJ_APP_CLOSE_TO_HOME,

            CUJ_APP_CLOSE_TO_HOME,

            CUJ_APP_CLOSE_TO_HOME_FALLBACK,

            CUJ_APP_CLOSE_TO_PIP,

            CUJ_APP_CLOSE_TO_PIP,

            CUJ_QUICK_SWITCH,

            CUJ_QUICK_SWITCH,

            CUJ_APP_LAUNCH_FROM_WIDGET,

            CUJ_APP_LAUNCH_FROM_WIDGET,