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

Commit 1d20402d authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "Prevent flings after motion gestures on fully expanded keyguard take 2" into tm-qpr-dev

parents c3d921e6 10ee9baa

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -3556,7 +3556,13 @@ public final class NotificationPanelViewController implements Dumpable { 
                            : (mKeyguardStateController.canDismissLockScreen()

                            : (mKeyguardStateController.canDismissLockScreen()

                                    ? UNLOCK : BOUNCER_UNLOCK);

                                    ? UNLOCK : BOUNCER_UNLOCK);





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

            // touch has been intercepted already so flinging here is redundant

            if (mBarState == KEYGUARD && mExpandedFraction >= 1.0) {

                mShadeLog.d("NPVC endMotionEvent - skipping fling on keyguard");

            } else {

                fling(vel, expand, isFalseTouch(x, y, interactionType));

                fling(vel, expand, isFalseTouch(x, y, interactionType));

            }

            onTrackingStopped(expand);

            onTrackingStopped(expand);

            mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown;

            mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown;

            if (mUpdateFlingOnLayout) {

            if (mUpdateFlingOnLayout) {