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 take 2" into tm-qpr-dev am: 1d20402d43 am: 86dbfdd394

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

Change-Id: Ib52e2ca4ef051a91c104a80101a6c56c67f2e2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lee
2023-03-20 17:32:05 +00:00
committed by Automerger Merge Worker
parent 30fa59da6c 86dbfdd394
commit 6bc0090741
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3629,7 +3629,13 @@ public final class NotificationPanelViewController implements Dumpable {
: (mKeyguardStateController.canDismissLockScreen()
? UNLOCK : BOUNCER_UNLOCK);
fling(vel, expand, isFalseTouch(x, y, interactionType));
// 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));
}
onTrackingStopped(expand);
mUpdateFlingOnLayout = expand && mPanelClosedOnDown && !mHasLayoutedSinceDown;
if (mUpdateFlingOnLayout) {