From 442e4d0846df4566ce2fa9c4c627125f2983ee8c Mon Sep 17 00:00:00 2001 From: Clark Scheff Date: Tue, 23 Sep 2014 15:45:26 -0700 Subject: Replace option menu with reset/delete actions The code and xml for the popup menu are still in place for future use. The image view for the menu is simply set to View.GONE so it will not be available to the user at this time. Change-Id: I7897e1c06532c51d6be82edca3bb76c37acbf9ae --- src/android/support/v4/view/ThemeViewPager.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/android') diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java index dadd5fc..2c8f55a 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -54,6 +54,8 @@ public class ThemeViewPager extends ViewPager { case MotionEvent.ACTION_DOWN: intercept = getChildCount() > 0 && !isTouching(R.id.customize, ev) && !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; -- cgit v1.1