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

Commit 10b4ae30 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 am: 7a2f650a am: 8963d739

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



Change-Id: Ica7a5a0fe6d345cf2a3368dadc2d4a6165fa2423
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6b579fa 8963d739

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

+7 −4
Original line number Diff line number Diff line
@@ -3581,12 +3581,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(
@@ -3634,9 +3637,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);

        }