diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-10-30 19:41:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-30 19:41:24 -0700 |
| commit | b4529b0adca243644f601c9fe5d419c283bf57c1 (patch) | |
| tree | acbfa5692eb2c581cb8ecb983310e22b28b31750 /core/java/android | |
| parent | 18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb (diff) | |
| parent | 9edd58e9504cc3f070758e9125c49a72a3642186 (diff) | |
Merge "HorizontalScrollView should delay child presses" into ics-mr1
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 57701aede14e..1683d202c1c0 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -697,6 +697,11 @@ public class HorizontalScrollView extends FrameLayout { } @Override + public boolean shouldDelayChildPressedState() { + return true; + } + + @Override protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { // Treat animating scrolls differently; see #computeScroll() for why. |