diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-08-05 14:23:02 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-08-07 15:26:48 +0000 |
| commit | 475c295cac411217a5e71ea0be61bf758853b588 (patch) | |
| tree | 4c8d47bc317abd71f1611295805059868a3b18f5 /src/android | |
| parent | d30f602baf09651680399b535d2ac6fcfc2c1aad (diff) | |
| download | packages_apps_ThemeChooser-475c295cac411217a5e71ea0be61bf758853b588.zip packages_apps_ThemeChooser-475c295cac411217a5e71ea0be61bf758853b588.tar.gz packages_apps_ThemeChooser-475c295cac411217a5e71ea0be61bf758853b588.tar.bz2 | |
Implement new apply UI
Change-Id: I9d57114bb5878b2e6c734733306be707b039f188
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/support/v4/view/ThemeViewPager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java index d4054b7..d3577e7 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -56,7 +56,8 @@ public class ThemeViewPager extends ViewPager { if (!mExpanded && isEnabled() && !mIsAnimating) { switch (ev.getAction()) { case MotionEvent.ACTION_DOWN: - intercept = !isTouching(R.id.customize, ev) && !isTouching(R.id.overflow, ev); + intercept = !isTouching(R.id.customize, ev) && !isTouching(R.id.overflow, ev) + && !isTouching(R.id.apply_theme_layout, ev); break; } } |