diff options
| author | Andrew Mast <andy@cyngn.com> | 2014-08-08 09:50:43 -0700 |
|---|---|---|
| committer | Andrew Mast <andy@cyngn.com> | 2014-08-08 12:05:37 -0700 |
| commit | 6707d3a63e1abb20059a0a351158f2eb34dd00e7 (patch) | |
| tree | bf63102144154727b6a647090624473f4eaa7d61 /src/android | |
| parent | 5ac8d238009ca3dd90d0609762f60c9a02db2206 (diff) | |
| download | packages_apps_ThemeChooser-6707d3a63e1abb20059a0a351158f2eb34dd00e7.zip packages_apps_ThemeChooser-6707d3a63e1abb20059a0a351158f2eb34dd00e7.tar.gz packages_apps_ThemeChooser-6707d3a63e1abb20059a0a351158f2eb34dd00e7.tar.bz2 | |
Fix NPE on first start
If you clear data and start the app and click the empty viewpager
you get an NPE.
Change-Id: I1a6c519e8edc820f2c34c46e186c28baf2b4ff04
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 d3577e7..c949da6 100644 --- a/src/android/support/v4/view/ThemeViewPager.java +++ b/src/android/support/v4/view/ThemeViewPager.java @@ -56,7 +56,7 @@ 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 = getChildCount() > 0 && !isTouching(R.id.customize, ev) && !isTouching(R.id.overflow, ev) && !isTouching(R.id.apply_theme_layout, ev); break; } @@ -69,6 +69,7 @@ public class ThemeViewPager extends ViewPager { int x = (int) ev.getRawX(); int y = (int) ev.getRawY(); View v = getViewForPosition(getCurrentItem()); + if (v == null) return false; View touchedView = v.findViewById(viewId); if (touchedView == null || touchedView.getVisibility() != View.VISIBLE) { |