diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-07-10 16:47:59 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-07-14 15:45:19 -0700 |
| commit | 53d84759926ff7bb6545b78d1089808c73219d40 (patch) | |
| tree | 611025a27ccc1000c42f851a0609aa56edb685ef /src/android | |
| parent | 36f745ed8c21c4bbb05cf99ed9f0b4fd1c8d448d (diff) | |
| download | packages_apps_ThemeChooser-53d84759926ff7bb6545b78d1089808c73219d40.zip packages_apps_ThemeChooser-53d84759926ff7bb6545b78d1089808c73219d40.tar.gz packages_apps_ThemeChooser-53d84759926ff7bb6545b78d1089808c73219d40.tar.bz2 | |
Implement mixnmatch component selection from detail view
Currently only icons, fonts, status bar, and navigation bar are
implemented. Once other cards are added to the detail view we
can add them for mixnmatch
Change-Id: I524483f51a7cb76db06844c333340c491c87d7ac
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/support/v4/view/ThemeViewPager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java index 3fb1d61..e1513e1 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -48,7 +48,7 @@ public class ThemeViewPager extends ViewPager { @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - return true; + return !mExpanded; } @Override @@ -77,7 +77,7 @@ public class ThemeViewPager extends ViewPager { } if (mExpanded) { - return true; + return false; } return super.onTouchEvent(ev); |