summaryrefslogtreecommitdiffstats
path: root/src/android/support/v4/view/ThemeViewPager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/android/support/v4/view/ThemeViewPager.java')
-rw-r--r--src/android/support/v4/view/ThemeViewPager.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java
index 1cde715..b430f5f 100644
--- a/src/android/support/v4/view/ThemeViewPager.java
+++ b/src/android/support/v4/view/ThemeViewPager.java
@@ -66,10 +66,8 @@ public class ThemeViewPager extends ViewPager {
if (!mExpanded && isEnabled() && !mIsAnimating) {
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
- intercept = getChildCount() > 0 && !isTouching(R.id.customize, ev)
+ intercept = getChildCount() > 0
&& !isTouching(R.id.overflow, ev)
- && !isTouching(R.id.reset, ev)
- && !isTouching(R.id.delete, ev)
&& !isTouching(R.id.confirm_cancel_overlay, ev)
&& !isTouching(R.id.customize_reset_theme_layout, ev);
break;