Merge "Prevent flings after motion gestures on fully expanded keyguard" into tm-qpr-dev
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index 6b2d744..fdaeeee 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 @@
}
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 @@
if (mUpdateFlingOnLayout) {
mUpdateFlingVelocity = vel;
}
- } else if (!mCentralSurfaces.isBouncerShowing()
+ } else if (fullyExpandedInKeyguard || (!mCentralSurfaces.isBouncerShowing()
&& !mAlternateBouncerInteractor.isVisibleState()
- && !mKeyguardStateController.isKeyguardGoingAway()) {
+ && !mKeyguardStateController.isKeyguardGoingAway())) {
onEmptySpaceClick();
onTrackingStopped(true);
}