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

Commit 75898f79 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 am: 4002108d am: ced6af5d

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



Change-Id: Ia2a4a6af0f1530ae8052815038ad4180581aa5d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54f9fad5 ced6af5d

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

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

        }