Ensure that SwipeDismissBehavior only swipes it's own View
Currently it could intercept the touch for any view within
the CoordinatorLayout. This CL fixes it by checking
that the MotionEvent is within the Behaviors attached
View.
BUG: 21838809
Change-Id: I9f22443ea65a9e7d4b6d63e58a513bd57824204b
diff --git a/design/src/android/support/design/widget/SwipeDismissBehavior.java b/design/src/android/support/design/widget/SwipeDismissBehavior.java
index d6c1338..2a503a2 100644
--- a/design/src/android/support/design/widget/SwipeDismissBehavior.java
+++ b/design/src/android/support/design/widget/SwipeDismissBehavior.java
@@ -17,6 +17,7 @@
package android.support.design.widget;
import android.support.annotation.IntDef;
+import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.ViewDragHelper;
import android.view.MotionEvent;
@@ -165,11 +166,7 @@
@Override
public boolean onInterceptTouchEvent(CoordinatorLayout parent, V child, MotionEvent event) {
- switch (event.getActionMasked()) {
- case MotionEvent.ACTION_DOWN:
- mIgnoreEvents = !parent.isPointInChildBounds(child,
- (int) event.getX(), (int) event.getY());
- break;
+ switch (MotionEventCompat.getActionMasked(event)) {
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
// Reset the ignore flag
@@ -178,6 +175,10 @@
return false;
}
break;
+ default:
+ mIgnoreEvents = !parent.isPointInChildBounds(child,
+ (int) event.getX(), (int) event.getY());
+ break;
}
if (mIgnoreEvents) {