Merge "Fix falsing on notification dismissal." into tm-qpr-dev am: b2cd31640e

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

Change-Id: I7622dabbcea296403e38643a6118d4f21acb3d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dave Mankoff
2023-01-05 17:11:23 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 2 deletions

View File

@@ -69,6 +69,8 @@ public class TypeClassifier extends FalsingClassifier {
// A more sophisticated thing to do here would be to look at the size of the
// vertical change relative to the screen size. _Some_ amount of vertical
// change should be expected.
wrongDirection = vertical;
break;
case NOTIFICATION_DISMISS:
wrongDirection = vertical;
break;

View File

@@ -1902,8 +1902,10 @@ public class NotificationStackScrollLayoutController {
}
if (ev.getActionMasked() == MotionEvent.ACTION_UP) {
// Ensure the falsing manager records the touch. we don't do anything with it
// at the moment.
mFalsingManager.isFalseTouch(Classifier.SHADE_DRAG);
// at the moment, but it may trigger a global falsing event.
if (!horizontalSwipeWantsIt) {
mFalsingManager.isFalseTouch(Classifier.SHADE_DRAG);
}
mView.setCheckForLeaveBehind(true);
}
traceJankOnTouchEvent(ev.getActionMasked(), scrollerWantsIt);