diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 6b2d7443392d..fdaeeee26812 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -3508,12 +3508,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( @@ -3561,9 +3564,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); } |