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

Commit 10ee9baa authored by Shawn Lee's avatar Shawn Lee
Browse files

Prevent flings after motion gestures on fully expanded keyguard take 2 

Narrower version of original reverted change.

Any up-down gesture on keyguard would trigger a fling that visibly
jumped the keyguard up due to the different height calculation for
shade vs keyguard. If the gesture was quick enough, we were stuck
with this incorrect expansion fraction until the next touch.
This change simply blocks flings on keyguard off
guestures that end at full expansion, since touch has already
been intercepted by NotificationShadeWindowViewController when
we're about to fling from that state.

Test: manual
Bug: 259023628
Change-Id: I0c8d585c964ec8046395b260b5a7a60849beab2b
parent 5ac43d6f

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -3555,7 +3555,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) {