Merge "Revert "Ignore ACTION_DOWN events when mTracking is true"" into tm-qpr-dev

This commit is contained in:
Justin Weir
2023-02-16 12:23:24 +00:00
committed by Android (Google) Code Review

View File

@@ -4636,11 +4636,6 @@ 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;
@@ -4728,11 +4723,6 @@ 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();
} }