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

Commit 7a2f650a authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Prevent flings after motion gestures on fully expanded keyguard" into... 

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

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



Change-Id: I573e2f9497d9073448c49ea0e45f82b83ef57467
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95bbf598 6c78bab2

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

+7 −4
Original line number Diff line number Diff line
@@ -3508,12 +3508,15 @@ 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 ((mTracking && mTouchSlopExceeded) || Math.abs(x - mInitialExpandX) > mTouchSlop

        if (!fullyExpandedInKeyguard && ((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(
@@ -3561,9 +3564,9 @@ public final class NotificationPanelViewController implements Dumpable { 
            if (mUpdateFlingOnLayout) {

                mUpdateFlingVelocity = vel;

            }

        } else if (!mCentralSurfaces.isBouncerShowing()

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

                && !mAlternateBouncerInteractor.isVisibleState()

                && !mKeyguardStateController.isKeyguardGoingAway()) {

                && !mKeyguardStateController.isKeyguardGoingAway())) {

            onEmptySpaceClick();

            onTrackingStopped(true);

        }