diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-04-12 16:22:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 16:22:34 -0700 |
| commit | 4a5af365af41fcd759e6480c45166817c6e7bd3e (patch) | |
| tree | 0dfb73df09c5f686e242e301ad8e3ee166fc62a5 | |
| parent | f6c8282cf3b0760c6eda519282f3d4c1c1acfeae (diff) | |
| parent | 83dc45c65988e9b86e156d59f59ede48195ed1d5 (diff) | |
| download | frameworks_base-4a5af365af41fcd759e6480c45166817c6e7bd3e.zip frameworks_base-4a5af365af41fcd759e6480c45166817c6e7bd3e.tar.gz frameworks_base-4a5af365af41fcd759e6480c45166817c6e7bd3e.tar.bz2 | |
Merge "NumberPicker cannot fling in scrollable containers."
| -rw-r--r-- | core/java/android/widget/NumberPicker.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 9fbe9a2..7278b1d2 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -771,6 +771,8 @@ public class NumberPicker extends LinearLayout { mLastDownEventTime = event.getEventTime(); mIngonreMoveEvents = false; mShowSoftInputOnTap = false; + // Make sure we wupport flinging inside scrollables. + getParent().requestDisallowInterceptTouchEvent(true); if (!mFlingScroller.isFinished()) { mFlingScroller.forceFinished(true); mAdjustScroller.forceFinished(true); |