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

Commit e5902971 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Add Wear Tiles Carousel jank CUJ" 

Revert submission 33106450-wear-carousel-jank

Reason for revert: Droidmonitor created revert due to b/416007152. Will be verifying through ABTD before submission.

Fix: 416007152

Reverted changes: /q/submissionid:33106450-wear-carousel-jank

Change-Id: Icf7c94e751344ad4f4f019ac1f78903534e2176e
parent b6dd8979

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

+5 −62
Original line number Diff line number Diff line
@@ -347,58 +347,9 @@ public class Cuj { 
     */

    public static final int CUJ_LPP_ASSIST_INVOCATION_EFFECT = 132;



    /**

     * Track wear tiles carousel jank.

     *

     * <p>The Tile Carousel is a UI module that hosts a watch face overlay and individual tile

     * surfaces, or an empty state placeholder tile if no tiles are configured to be shown. Swiping

     * horizontally from the watch face will cycle through all available tiles and eventually land

     * back on the watch face.

     *

     * <p>Tracking starts when the user scrolls the watch carousel. Tracking ends when the carousel

     * stops moving. This includes scrolling from watchface to a tile, and between tiles. A scroll

     * is any gesture that causes the carousel to move (regardless of speed and velocity).

     *

     * <p>A scroll event is always logged, alongside either a swipe or a fling event.

     */

    public static final int CUJ_WEAR_CAROUSEL_SCROLL_JANK = 133;



    /**

     * Track wear tiles carousel jank.

     *

     * <p>The Tile Carousel is a UI module that hosts a watch face overlay and individual tile

     * surfaces, or an empty state placeholder tile if no tiles are configured to be shown. Swiping

     * horizontally from the watch face will cycle through all available tiles and eventually land

     * back on the watch face.

     *

     * <p>Tracking starts when the user scrolls the watch carousel. Tracking ends when the carousel

     * stops moving. This includes scrolling from watchface to a tile, and between tiles.

     *

     * <p>A fling is any gesture that lasts less than a certain threshold

     * (http://google3/java/com/google/android/clockwork/sysui/mainui/module/carousel/HorizontalCarouselController.java;l=105;rcl=750121574).

     * A scroll event is always logged alongside this event.

     */

    public static final int CUJ_WEAR_CAROUSEL_FLING_JANK = 134;



    /**

     * Track wear tiles carousel jank.

     *

     * <p>The Tile Carousel is a UI module that hosts a watch face overlay and individual tile

     * surfaces, or an empty state placeholder tile if no tiles are configured to be shown. Swiping

     * horizontally from the watch face will cycle through all available tiles and eventually land

     * back on the watch face.

     *

     * <p>Tracking starts when the user scrolls the watch carousel. Tracking ends when the carousel

     * stops moving. This includes scrolling from watchface to a tile, and between tiles.

     *

     * <p>A swipe is any gesture that lasts more than a certain threshold

     * (http://google3/java/com/google/android/clockwork/sysui/mainui/module/carousel/HorizontalCarouselController.java;l=105;rcl=750121574).

     * A scroll event is always logged alongside this event.

     */

    public static final int CUJ_WEAR_CAROUSEL_SWIPE_JANK = 135;



    // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.

    @VisibleForTesting static final int LAST_CUJ = CUJ_WEAR_CAROUSEL_SWIPE_JANK;

    @VisibleForTesting static final int LAST_CUJ = CUJ_LPP_ASSIST_INVOCATION_EFFECT;



    /** @hide */

    @IntDef({
@@ -522,9 +473,7 @@ public class Cuj { 
            CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY,

            CUJ_STATUS_BAR_APP_RETURN_TO_CALL_CHIP,

            CUJ_NOTIFICATIONS_ANIMATED_ACTION,

            CUJ_WEAR_CAROUSEL_SCROLL_JANK,

            CUJ_WEAR_CAROUSEL_FLING_JANK,

            CUJ_WEAR_CAROUSEL_SWIPE_JANK

            CUJ_LPP_ASSIST_INVOCATION_EFFECT

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {}
@@ -658,9 +607,7 @@ public class Cuj { 
        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_STATUS_BAR_APP_RETURN_TO_CALL_CHIP] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__STATUS_BAR_APP_RETURN_TO_CALL_CHIP;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_NOTIFICATIONS_ANIMATED_ACTION] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__NOTIFICATIONS_ANIMATED_ACTION;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_WEAR_CAROUSEL_SCROLL_JANK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WEAR_CAROUSEL_SCROLL_JANK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_WEAR_CAROUSEL_FLING_JANK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WEAR_CAROUSEL_FLING_JANK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_WEAR_CAROUSEL_SWIPE_JANK] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WEAR_CAROUSEL_SWIPE_JANK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LPP_ASSIST_INVOCATION_EFFECT] = FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LPP_ASSIST_INVOCATION_EFFECT;

    }



    private Cuj() {
@@ -919,12 +866,8 @@ public class Cuj { 
                return "STATUS_BAR_APP_RETURN_TO_CALL_CHIP";

            case CUJ_NOTIFICATIONS_ANIMATED_ACTION:

                return "NOTIFICATIONS_ANIMATED_ACTION";

            case CUJ_WEAR_CAROUSEL_SCROLL_JANK:

                return "WEAR_CAROUSEL_SCROLL_JANK";

            case CUJ_WEAR_CAROUSEL_FLING_JANK:

                return "WEAR_CAROUSEL_FLING_JANK";

            case CUJ_WEAR_CAROUSEL_SWIPE_JANK:

                return "WEAR_CAROUSEL_SWIPE_JANK";

            case CUJ_LPP_ASSIST_INVOCATION_EFFECT:

                return "LPP_ASSIST_INVOCATION_EFFECT";

        }

        return "UNKNOWN";

    }