diff options
| author | Adam Powell <adamp@google.com> | 2012-07-31 16:39:32 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2012-07-31 16:39:32 -0700 |
| commit | 0278c2fcbae9fccaddd1fca243218a34923417ec (patch) | |
| tree | a13b9bb91ceaf74a416683d93f570fd8382e90ab /core | |
| parent | 9dcfff205e05c62e97b5aabedaa8c30309b99738 (diff) | |
| download | frameworks_base-0278c2fcbae9fccaddd1fca243218a34923417ec.zip frameworks_base-0278c2fcbae9fccaddd1fca243218a34923417ec.tar.gz frameworks_base-0278c2fcbae9fccaddd1fca243218a34923417ec.tar.bz2 | |
Don't let ScrollView intercept touch events if it can't scroll.
Bug 6872104
Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 7 |
1 files changed, 7 insertions, 0 deletions
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: { /* |