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

Commit 40ae6955 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Choose a better impossible value for mStatusBarLongPressDowntime" into main

parents f1b14cec 61fb28d5

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

+3 −3
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private final TouchHandler mTouchHandler = new TouchHandler();



    private long mDownTime;

    private long mStatusBarLongPressDowntime;

    private long mStatusBarLongPressDowntime = -1L;

    private boolean mTouchSlopExceededBeforeDown;

    private float mOverExpansion;

    private CentralSurfaces mCentralSurfaces;
@@ -3709,7 +3709,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) {

        mShadeLog.logEndMotionEvent("endMotionEvent called", forceCancel, false);

        mTrackingPointer = -1;

        mStatusBarLongPressDowntime = 0L;

        mStatusBarLongPressDowntime = -1L;

        mAmbientState.setSwipingUp(false);

        if ((isTracking() && mTouchSlopExceeded) || Math.abs(x - mInitialExpandX) > mTouchSlop

                || Math.abs(y - mInitialExpandY) > mTouchSlop
@@ -5105,7 +5105,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                    mUpdateFlingOnLayout = false;

                    mMotionAborted = false;

                    mDownTime = mSystemClock.uptimeMillis();

                    mStatusBarLongPressDowntime = 0L;

                    mStatusBarLongPressDowntime = -1L;

                    mTouchAboveFalsingThreshold = false;

                    mCollapsedAndHeadsUpOnDown =

                            isFullyCollapsed() && mHeadsUpManager.hasPinnedHeadsUp();