summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorClark Scheff <clark@cyngn.com>2014-07-16 16:53:08 -0700
committerd34d <clark@cyngn.com>2014-07-17 08:29:28 -0700
commitaccf71cc2f859c8c8d241e7f67fe118ac82bf6f5 (patch)
treef65476e4165b18d419e29ae6bab7b22bd0ccc893 /src/android
parente8e880c66ba2734cf1f5101ca2d3f19658b55bf0 (diff)
downloadpackages_apps_ThemeChooser-accf71cc2f859c8c8d241e7f67fe118ac82bf6f5.zip
packages_apps_ThemeChooser-accf71cc2f859c8c8d241e7f67fe118ac82bf6f5.tar.gz
packages_apps_ThemeChooser-accf71cc2f859c8c8d241e7f67fe118ac82bf6f5.tar.bz2
Add applying theme progress along with animations.
Change-Id: Id7835d3be0b9d9c8d861e820e63b45e17235ef68
Diffstat (limited to 'src/android')
-rw-r--r--src/android/support/v4/view/ThemeViewPager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java
index 9a4ce9d..cf13871 100644
--- a/src/android/support/v4/view/ThemeViewPager.java
+++ b/src/android/support/v4/view/ThemeViewPager.java
@@ -49,7 +49,7 @@ public class ThemeViewPager extends ViewPager {
public boolean onInterceptTouchEvent(MotionEvent ev) {
boolean intercept = false;
- if (!mExpanded) {
+ if (!mExpanded && isEnabled()) {
switch (ev.getAction()) {
case MotionEvent.ACTION_DOWN:
intercept = !isTouchingApplyButton(ev);