commit 8ab8fbbf46d8779f53301e7f706f97608eed7117
author Adam Powell <adamp@google.com> Tue Jul 31 16:41:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 31 16:41:37 2012 -0700
tree 363bebf8c9fbfbffd51e7b720f624897e5728438
parent a9fa7b25ddefc3ba4cbf30ce05453d5e3459dbe1
parent 0278c2fcbae9fccaddd1fca243218a34923417ec

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

core/java/android/widget/ScrollView.java

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 @@
             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: {
                 /*