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

Merge "Revert "Prevent flings after motion gestures on fully expanded keyguard"" into tm-qpr-dev am: 902540032c

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

Change-Id: I369949af3706c04332f0822dc068992431620069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lee
2023-03-16 00:08:01 +00:00
committed by Automerger Merge Worker
parent 18ef8977d0 902540032c
commit 4002108d9b
1 changed files with 4 additions and 7 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,15 +3508,12 @@ 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 (!fullyExpandedInKeyguard && ((mTracking && mTouchSlopExceeded)
|| Math.abs(x - mInitialExpandX) > mTouchSlop
if ((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(
@@ -3564,9 +3561,9 @@ public final class NotificationPanelViewController implements Dumpable {
if (mUpdateFlingOnLayout) {
mUpdateFlingVelocity = vel;
}
} else if (fullyExpandedInKeyguard || (!mCentralSurfaces.isBouncerShowing()
} else if (!mCentralSurfaces.isBouncerShowing()
&& !mAlternateBouncerInteractor.isVisibleState()
&& !mKeyguardStateController.isKeyguardGoingAway())) {
&& !mKeyguardStateController.isKeyguardGoingAway()) {
onEmptySpaceClick();
onTrackingStopped(true);
}