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

Commit 4002108d authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Prevent flings after motion gestures on fully expanded... 

Merge "Revert "Prevent flings after motion gestures on fully expanded keyguard"" into tm-qpr-dev am: 90254003

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



Change-Id: I369949af3706c04332f0822dc068992431620069
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18ef8977 90254003

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

+4 −7
Original line number Diff line number Diff line
@@ -3508,15 +3508,12 @@ public final class NotificationPanelViewController implements Dumpable { 
    }



    private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) {

        // don't fling while in keyguard to avoid jump in shade expand animation

        boolean fullyExpandedInKeyguard = mBarState == KEYGUARD && mExpandedFraction >= 1.0;

        mTrackingPointer = -1;

        mAmbientState.setSwipingUp(false);

        if (!fullyExpandedInKeyguard && ((mTracking && mTouchSlopExceeded)

                || Math.abs(x - mInitialExpandX) > mTouchSlop

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

                || Math.abs(y - mInitialExpandY) > mTouchSlop

                || (!isFullyExpanded() && !isFullyCollapsed())

                || event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel)) {

                || event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) {

            mVelocityTracker.computeCurrentVelocity(1000);

            float vel = mVelocityTracker.getYVelocity();

            float vectorVel = (float) Math.hypot(
@@ -3564,9 +3561,9 @@ public final class NotificationPanelViewController implements Dumpable { 
            if (mUpdateFlingOnLayout) {

                mUpdateFlingVelocity = vel;

            }

        } else if (fullyExpandedInKeyguard || (!mCentralSurfaces.isBouncerShowing()

        } else if (!mCentralSurfaces.isBouncerShowing()

                && !mAlternateBouncerInteractor.isVisibleState()

                && !mKeyguardStateController.isKeyguardGoingAway())) {

                && !mKeyguardStateController.isKeyguardGoingAway()) {

            onEmptySpaceClick();

            onTrackingStopped(true);

        }