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

Commit 8a3d7231 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Automerger Merge Worker
Browse files

Merge "Add CUJs for closing All Apps." into tm-qpr-dev am: e076cf2d am: 912afdc4 

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



Change-Id: Ibcb903e8f0127cfa7d9df6389d4cb7ada1195fd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b956e1ee 912afdc4

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

+13 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
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_APP_LAUNCH_FROM_WIDGET;

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

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

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

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__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;
@@ -228,6 +230,8 @@ public class InteractionJankMonitor { 
    public static final int CUJ_LOCKSCREEN_OCCLUSION = 64;

    public static final int CUJ_RECENTS_SCROLLING = 65;

    public static final int CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS = 66;

    public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE = 67;

    public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME = 68;



    private static final int NO_STATSD_LOGGING = -1;
@@ -303,6 +307,8 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_OCCLUSION,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__RECENTS_SCROLLING,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_SWIPE,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_TO_HOME,

    };



    private static class InstanceHolder {
@@ -393,7 +399,9 @@ public class InteractionJankMonitor { 
            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            CUJ_LOCKSCREEN_OCCLUSION,

            CUJ_RECENTS_SCROLLING,

            CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS

            CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS,

            CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE,

            CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -911,6 +919,10 @@ public class InteractionJankMonitor { 
                return "RECENTS_SCROLLING";

            case CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS:

                return "LAUNCHER_APP_SWIPE_TO_RECENTS";

            case CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE:

                return "LAUNCHER_CLOSE_ALL_APPS_SWIPE";

            case CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME:

                return "LAUNCHER_CLOSE_ALL_APPS_TO_HOME";

        }

        return "UNKNOWN";

    }

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

+8 −1
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_LAUNCHER_QUICK_SWITCH;

    public static final int CUJ_OPEN_ALL_APPS =

            InteractionJankMonitor.CUJ_LAUNCHER_OPEN_ALL_APPS;

    public static final int CUJ_CLOSE_ALL_APPS_SWIPE =

            InteractionJankMonitor.CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE;

    public static final int CUJ_CLOSE_ALL_APPS_TO_HOME =

            InteractionJankMonitor.CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME;

    public static final int CUJ_ALL_APPS_SCROLL =

            InteractionJankMonitor.CUJ_LAUNCHER_ALL_APPS_SCROLL;

    public static final int CUJ_APP_LAUNCH_FROM_WIDGET =
@@ -65,7 +69,10 @@ public final class InteractionJankMonitorWrapper { 
            CUJ_APP_LAUNCH_FROM_WIDGET,

            CUJ_LAUNCHER_UNLOCK_ENTRANCE_ANIMATION,

            CUJ_RECENTS_SCROLLING,

            CUJ_APP_SWIPE_TO_RECENTS

            CUJ_APP_SWIPE_TO_RECENTS,

            CUJ_OPEN_ALL_APPS,

            CUJ_CLOSE_ALL_APPS_SWIPE,

            CUJ_CLOSE_ALL_APPS_TO_HOME

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {