Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shawn Lee
2023-03-14 06:11:55 +00:00
committed by Android (Google) Code Review
parent e07cc86b6c e53315ec9c
commit 6c78bab2e3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -3508,12 +3508,15 @@ public final class NotificationPanelViewController implements Dumpable {
} }
private void endMotionEvent(MotionEvent event, float x, float y, boolean forceCancel) { 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; mTrackingPointer = -1;
mAmbientState.setSwipingUp(false); 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 || Math.abs(y - mInitialExpandY) > mTouchSlop
|| (!isFullyExpanded() && !isFullyCollapsed()) || (!isFullyExpanded() && !isFullyCollapsed())
|| event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel) { || event.getActionMasked() == MotionEvent.ACTION_CANCEL || forceCancel)) {
mVelocityTracker.computeCurrentVelocity(1000); mVelocityTracker.computeCurrentVelocity(1000);
float vel = mVelocityTracker.getYVelocity(); float vel = mVelocityTracker.getYVelocity();
float vectorVel = (float) Math.hypot( float vectorVel = (float) Math.hypot(
@@ -3561,9 +3564,9 @@ public final class NotificationPanelViewController implements Dumpable {
if (mUpdateFlingOnLayout) { if (mUpdateFlingOnLayout) {
mUpdateFlingVelocity = vel; mUpdateFlingVelocity = vel;
} }
} else if (!mCentralSurfaces.isBouncerShowing() } else if (fullyExpandedInKeyguard || (!mCentralSurfaces.isBouncerShowing()
&& !mAlternateBouncerInteractor.isVisibleState() && !mAlternateBouncerInteractor.isVisibleState()
&& !mKeyguardStateController.isKeyguardGoingAway()) { && !mKeyguardStateController.isKeyguardGoingAway())) {
onEmptySpaceClick(); onEmptySpaceClick();
onTrackingStopped(true); onTrackingStopped(true);
} }