diff options
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 0622aaea0..70746b38b 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -621,6 +621,9 @@ public abstract class PagedView extends ViewGroup { * scrolling there. */ + // Skip touch handling if there are no pages to swipe + if (getChildCount() <= 0) return super.onInterceptTouchEvent(ev); + /* * Shortcut the most recurring case: the user is in the dragging * state and he is moving his finger. We want to intercept this @@ -775,6 +778,9 @@ public abstract class PagedView extends ViewGroup { @Override public boolean onTouchEvent(MotionEvent ev) { + // Skip touch handling if there are no pages to swipe + if (getChildCount() <= 0) return super.onTouchEvent(ev); + acquireVelocityTrackerAndAddMovement(ev); final int action = ev.getAction(); |