Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev

2012-07-31 16:41:37 -07:00
parent a9fa7b25dd 0278c2fcba
commit 8ab8fbbf46
1 changed files with 7 additions and 0 deletions
--- 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: {
                /*