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

Commit fba030ba 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 take 2"... 

Merge "Prevent flings after motion gestures on fully expanded keyguard take 2" into tm-qpr-dev am: 1d20402d am: 86dbfdd3 am: 6bc00907 am: 0d3611f9

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



Change-Id: I7cd6a0df4aa9ee42f72d7b5cca0981f6ffd8fd00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29b17594 0d3611f9

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

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

                                    ? 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));

            }

            onTrackingStopped(expand);

            mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown;

            if (mUpdateFlingOnLayout) {