diff options
| author | Andy Mast <andy@cyngn.com> | 2014-07-21 09:53:51 -0700 |
|---|---|---|
| committer | Andy Mast <andy@cyngn.com> | 2014-07-23 21:49:20 +0000 |
| commit | 1a1a2332d39d056d2d863deea9738cd09c80e003 (patch) | |
| tree | 94fab182dac34605d99a5b43d654f27cb4294e77 /src/android | |
| parent | 0e554fb2ec729ecce9df46c2cfcfc4878a3ffac2 (diff) | |
| download | packages_apps_ThemeChooser-1a1a2332d39d056d2d863deea9738cd09c80e003.tar.gz packages_apps_ThemeChooser-1a1a2332d39d056d2d863deea9738cd09c80e003.tar.bz2 packages_apps_ThemeChooser-1a1a2332d39d056d2d863deea9738cd09c80e003.zip | |
Update UI from new redlines & assets
Change-Id: Ifc40edd9ee2a5bb5478af63d56991303be146e8e
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/support/v4/view/ThemeViewPager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java index cf13871..9c9b540 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -16,7 +16,6 @@ package android.support.v4.view; import android.content.Context; -import android.graphics.Rect; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -26,6 +25,7 @@ import org.cyanogenmod.theme.chooser.R; public class ThemeViewPager extends ViewPager { private boolean mExpanded; + private boolean mIsAnimating; private boolean mIsDragging = false; private float mSlop; @@ -45,11 +45,15 @@ public class ThemeViewPager extends ViewPager { mExpanded = expanded; } + public void setAnimating(boolean isAnimating) { + mIsAnimating = isAnimating; + } + @Override public boolean onInterceptTouchEvent(MotionEvent ev) { boolean intercept = false; - if (!mExpanded && isEnabled()) { + if (!mExpanded && isEnabled() && !mIsAnimating) { switch (ev.getAction()) { case MotionEvent.ACTION_DOWN: intercept = !isTouchingApplyButton(ev); |