diff options
| -rw-r--r-- | src/android/support/v4/view/ThemeViewPager.java | 7 | ||||
| -rw-r--r-- | src/com/cyngn/theme/chooser/ChooserActivity.java | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/android/support/v4/view/ThemeViewPager.java b/src/android/support/v4/view/ThemeViewPager.java index c949da6..8410e68 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -31,6 +31,7 @@ public class ThemeViewPager extends ViewPager { private float mSlop; private float mLastX; private float mLastY; + private boolean mScrollingEnabled = true; public ThemeViewPager(Context context, AttributeSet attrs) { super(context, attrs); @@ -114,7 +115,7 @@ public class ThemeViewPager extends ViewPager { break; } - if (mExpanded) { + if (mExpanded || !mScrollingEnabled) { return false; } @@ -139,4 +140,8 @@ public class ThemeViewPager extends ViewPager { } return view; } + + public void setScrollingEnabled(boolean enabled) { + mScrollingEnabled = enabled; + } } diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java index 7fc2c21..20abc14 100644 --- a/src/com/cyngn/theme/chooser/ChooserActivity.java +++ b/src/com/cyngn/theme/chooser/ChooserActivity.java @@ -245,7 +245,7 @@ public class ChooserActivity extends FragmentActivity */ public void themeChangeStarted() { mThemeChanging = true; - mPager.setEnabled(false); + lockPager(); } /** @@ -268,15 +268,15 @@ public class ChooserActivity extends FragmentActivity getSupportLoaderManager().restartLoader(LOADER_ID_APPLIED, null, ChooserActivity.this); } - mPager.setEnabled(true); + unlockPager(); } public void lockPager() { - mPager.setEnabled(false); + mPager.setScrollingEnabled(false); } public void unlockPager() { - mPager.setEnabled(true); + mPager.setScrollingEnabled(true); } public ComponentSelector getComponentSelector() { |