diff options
| author | Adam Powell <adamp@google.com> | 2012-07-31 16:41:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-31 16:41:37 -0700 |
| commit | 8ab8fbbf46d8779f53301e7f706f97608eed7117 (patch) | |
| tree | 363bebf8c9fbfbffd51e7b720f624897e5728438 /core | |
| parent | a9fa7b25ddefc3ba4cbf30ce05453d5e3459dbe1 (diff) | |
| parent | 0278c2fcbae9fccaddd1fca243218a34923417ec (diff) | |
| download | frameworks_base-8ab8fbbf46d8779f53301e7f706f97608eed7117.zip frameworks_base-8ab8fbbf46d8779f53301e7f706f97608eed7117.tar.gz frameworks_base-8ab8fbbf46d8779f53301e7f706f97608eed7117.tar.bz2 | |
Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev
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: { /* |