Merge "Prevent notification swipes from getting canceled too soon."

1 files changed, 5 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
index b4d2a14..d5885bb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java
@@ -148,6 +148,11 @@ public class NotificationRowLayout extends ViewGroup {
                                 "now sliding child %d: %s (touchY=%.1f, rowHeight=%d, count=%d)",
                                 childIdx, mSlidingChild, mInitialTouchY, mRowHeight, count));
                         }
+
+
+                        // We need to prevent the surrounding ScrollView from intercepting us now;
+                        // the scroll position will be locked while we swipe
+                        requestDisallowInterceptTouchEvent(true);
                     }
                 }
                 break;