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

Merge "Ignore ACTION_DOWN events when mTracking is true" into tm-qpr-dev am: 844bcac763

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

Change-Id: If72d56680855431c56db92ef9941b768faed7120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2023-02-02 21:01:57 +00:00
committed by Automerger Merge Worker
parent eb57d62a04 844bcac763
commit 7462bf2f6c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6135,6 +6135,11 @@ public final class NotificationPanelViewController implements Dumpable {
switch (event.getActionMasked()) { switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
if (mTracking) {
// TODO(b/247126247) fix underlying issue. Should be ACTION_POINTER_DOWN.
mShadeLog.d("Don't intercept down event while already tracking");
return false;
}
mCentralSurfaces.userActivity(); mCentralSurfaces.userActivity();
mAnimatingOnDown = mHeightAnimator != null && !mIsSpringBackAnimation; mAnimatingOnDown = mHeightAnimator != null && !mIsSpringBackAnimation;
mMinExpandHeight = 0.0f; mMinExpandHeight = 0.0f;
@@ -6222,6 +6227,11 @@ public final class NotificationPanelViewController implements Dumpable {
"onTouch: duplicate down event detected... ignoring"); "onTouch: duplicate down event detected... ignoring");
return true; return true;
} }
if (mTracking) {
// TODO(b/247126247) fix underlying issue. Should be ACTION_POINTER_DOWN.
mShadeLog.d("Don't handle down event while already tracking");
return true;
}
mLastTouchDownTime = event.getDownTime(); mLastTouchDownTime = event.getDownTime();
} }