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

Commit 39da75ad authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[SB] Remove CUJ tracking opening the shade from the status bar." into main

parents 364343e9 5b71f779

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

+1 −6
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON;

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

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

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

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

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

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_NOTIFICATION_ADD;
@@ -269,7 +268,6 @@ public class InteractionJankMonitor { 
     * eg: Exit the app using back gesture.

     */

    public static final int CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK = 78;

    public static final int CUJ_SHADE_EXPAND_FROM_STATUS_BAR = 79;

    public static final int CUJ_IME_INSETS_SHOW_ANIMATION = 80;

    public static final int CUJ_IME_INSETS_HIDE_ANIMATION = 81;
@@ -364,7 +362,7 @@ public class InteractionJankMonitor { 
        CUJ_TO_STATSD_INTERACTION_TYPE[76] = NO_STATSD_LOGGING;

        CUJ_TO_STATSD_INTERACTION_TYPE[77] = NO_STATSD_LOGGING;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_SHADE_EXPAND_FROM_STATUS_BAR] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_FROM_STATUS_BAR;

        CUJ_TO_STATSD_INTERACTION_TYPE[79] = NO_STATSD_LOGGING; // This is deprecated.

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_SHOW_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_SHOW_ANIMATION;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_IME_INSETS_HIDE_ANIMATION] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__IME_INSETS_HIDE_ANIMATION;

        CUJ_TO_STATSD_INTERACTION_TYPE[CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER] = UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLIT_SCREEN_DOUBLE_TAP_DIVIDER;
@@ -467,7 +465,6 @@ public class InteractionJankMonitor { 
            CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION,

            CUJ_LAUNCHER_OPEN_SEARCH_RESULT,

            CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK,

            CUJ_SHADE_EXPAND_FROM_STATUS_BAR,

            CUJ_IME_INSETS_SHOW_ANIMATION,

            CUJ_IME_INSETS_HIDE_ANIMATION,

            CUJ_SPLIT_SCREEN_DOUBLE_TAP_DIVIDER,
@@ -1082,8 +1079,6 @@ public class InteractionJankMonitor { 
                return "LAUNCHER_OPEN_SEARCH_RESULT";

            case CUJ_LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK:

                return "LAUNCHER_APP_CLOSE_TO_HOME_FALLBACK";

            case CUJ_SHADE_EXPAND_FROM_STATUS_BAR:

                return "SHADE_EXPAND_FROM_STATUS_BAR";

            case CUJ_IME_INSETS_SHOW_ANIMATION:

                return "IME_INSETS_SHOW_ANIMATION";

            case CUJ_IME_INSETS_HIDE_ANIMATION:

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

+0 −3
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ public final class InteractionJankMonitorWrapper { 
            InteractionJankMonitor.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS;

    public static final int CUJ_OPEN_SEARCH_RESULT =

            InteractionJankMonitor.CUJ_LAUNCHER_OPEN_SEARCH_RESULT;

    public static final int CUJ_SHADE_EXPAND_FROM_STATUS_BAR =

            InteractionJankMonitor.CUJ_SHADE_EXPAND_FROM_STATUS_BAR;



    @IntDef({

            CUJ_APP_LAUNCH_FROM_RECENTS,
@@ -79,7 +77,6 @@ public final class InteractionJankMonitorWrapper { 
            CUJ_CLOSE_ALL_APPS_SWIPE,

            CUJ_CLOSE_ALL_APPS_TO_HOME,

            CUJ_OPEN_SEARCH_RESULT,

            CUJ_SHADE_EXPAND_FROM_STATUS_BAR,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −39
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;

import com.android.systemui.shade.data.repository.ShadeRepository;

import com.android.systemui.shade.transition.ShadeTransitionController;

import com.android.systemui.shared.system.InteractionJankMonitorWrapper;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.GestureRecorder;
@@ -370,7 +369,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    /** The current squish amount for the predictive back animation */

    private float mCurrentBackProgress = 0.0f;

    private boolean mTracking;

    private boolean mIsTrackingExpansionFromStatusBar;

    private boolean mHintAnimationRunning;

    @Deprecated

    private KeyguardBottomAreaView mKeyguardBottomArea;
@@ -2845,7 +2843,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


    private void onTrackingStopped(boolean expand) {

        mTracking = false;

        maybeStopTrackingExpansionFromStatusBar(expand);



        updateExpansionAndVisibility();

        if (expand) {
@@ -4243,42 +4240,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return mTouchHandler.onTouchEvent(event);

    }



    @Override

    public void startTrackingExpansionFromStatusBar() {

        mIsTrackingExpansionFromStatusBar = true;

        InteractionJankMonitorWrapper.begin(

                mView, InteractionJankMonitorWrapper.CUJ_SHADE_EXPAND_FROM_STATUS_BAR);

    }



    /**

     * Stops tracking an expansion that originated from the status bar (if we had started tracking

     * it).

     *

     * @param expand the expand boolean passed to {@link #onTrackingStopped(boolean)}.

     */

    private void maybeStopTrackingExpansionFromStatusBar(boolean expand) {

        if (!mIsTrackingExpansionFromStatusBar) {

            return;

        }

        mIsTrackingExpansionFromStatusBar = false;



        // Determine whether the shade actually expanded due to the status bar touch:

        // - If the user just taps on the status bar, then #isExpanded is false but

        // #onTrackingStopped is called with `true`.

        // - If the user drags down on the status bar but doesn't drag down far enough, then

        // #onTrackingStopped is called with `false` but #isExpanded is true.

        // So, we need *both* #onTrackingStopped called with `true` *and* #isExpanded to be true in

        // order to confirm that the shade successfully opened.

        boolean shadeExpansionFromStatusBarSucceeded = expand && isExpanded();

        if (shadeExpansionFromStatusBarSucceeded) {

            InteractionJankMonitorWrapper.end(

                    InteractionJankMonitorWrapper.CUJ_SHADE_EXPAND_FROM_STATUS_BAR);

        } else {

            InteractionJankMonitorWrapper.cancel(

                    InteractionJankMonitorWrapper.CUJ_SHADE_EXPAND_FROM_STATUS_BAR);

        }

    }



    @Override

    public void updateTouchableRegion() {

        //A layout will ensure that onComputeInternalInsets will be called and after that we can

packages/SystemUI/src/com/android/systemui/shade/ShadeViewController.kt

+0 −3
Original line number Diff line number Diff line
@@ -248,9 +248,6 @@ interface ShadeViewController { 
    /** Sends an external (e.g. Status Bar) touch event to the Shade touch handler. */

    fun handleExternalTouch(event: MotionEvent): Boolean



    /** Starts tracking a shade expansion gesture that originated from the status bar. */

    fun startTrackingExpansionFromStatusBar()



    /**

     * Performs haptic feedback from a view with a haptic feedback constant.

     *

packages/SystemUI/src/com/android/systemui/shade/ShadeViewControllerEmptyImpl.kt

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ class ShadeViewControllerEmptyImpl @Inject constructor() : ShadeViewController { 
    override fun handleExternalTouch(event: MotionEvent): Boolean {

        return false

    }

    override fun startTrackingExpansionFromStatusBar() {}

    override fun performHapticFeedback(constant: Int) {}



    override val shadeHeadsUpTracker = ShadeHeadsUpTrackerEmptyImpl()