Merge "Revert "Ignore ACTION_DOWN events when mTracking is true"" into tm-qpr-dev am: ecfcdcb6a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21452524 Change-Id: I23467e246597b9be6109d9805f8314d9c2be8a6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user