diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-09-23 15:45:26 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-09-25 21:23:54 +0000 |
| commit | 442e4d0846df4566ce2fa9c4c627125f2983ee8c (patch) | |
| tree | f720d8a6ca8505fe32ea79e2fe98a862be13abc0 /src/android | |
| parent | 885239ffdcf1538427226e582b0aee80ce920afd (diff) | |
| download | packages_apps_ThemeChooser-442e4d0846df4566ce2fa9c4c627125f2983ee8c.zip packages_apps_ThemeChooser-442e4d0846df4566ce2fa9c4c627125f2983ee8c.tar.gz packages_apps_ThemeChooser-442e4d0846df4566ce2fa9c4c627125f2983ee8c.tar.bz2 | |
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
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/support/v4/view/ThemeViewPager.java | 2 |
1 files changed, 2 insertions, 0 deletions
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; |