diff --git a/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java index f576a5af8907b..d8d2c98d7641b 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/TypeClassifier.java @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index c2c38a7b355bb..58919489496d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -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);