From 0278c2fcbae9fccaddd1fca243218a34923417ec Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Tue, 31 Jul 2012 16:39:32 -0700 Subject: Don't let ScrollView intercept touch events if it can't scroll. Bug 6872104 Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95 --- core/java/android/widget/ScrollView.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core') diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index ebc54f4..1711154 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -460,6 +460,13 @@ public class ScrollView extends FrameLayout { return true; } + /* + * Don't try to intercept touch if we can't scroll anyway. + */ + if (getScrollY() == 0 && !canScrollVertically(1)) { + return false; + } + switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_MOVE: { /* -- cgit v1.1