diff options
| author | Adam Powell <adamp@google.com> | 2012-07-31 16:43:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 16:43:49 -0700 |
| commit | 015b2c1e0b9a9d0b3defb2958931b04386128590 (patch) | |
| tree | 363bebf8c9fbfbffd51e7b720f624897e5728438 /core | |
| parent | 1e6b7a6462c612c151bb25803c293dfd7ab68cd3 (diff) | |
| parent | 8ab8fbbf46d8779f53301e7f706f97608eed7117 (diff) | |
| download | frameworks_base-015b2c1e0b9a9d0b3defb2958931b04386128590.zip frameworks_base-015b2c1e0b9a9d0b3defb2958931b04386128590.tar.gz frameworks_base-015b2c1e0b9a9d0b3defb2958931b04386128590.tar.bz2 | |
am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev
* commit '8ab8fbbf46d8779f53301e7f706f97608eed7117':
Don't let ScrollView intercept touch events if it can't scroll.
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: { /* |