Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1

Browse Source 
* commit '48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
  NumberPicker getting stuck if scroll wheel not wrapable.
This commit is contained in:
Svetoslav Ganov
2011-12-08 12:30:14 -08:00
committed by Android Git Automerger
parent a3c7c35873 48b428fb13
commit 33a3b2cecf
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/widget/NumberPicker.java
View File

@@ -776,6 +776,7 @@ public class NumberPicker extends LinearLayout {
mBeginEditOnUpEvent = false; mBeginEditOnUpEvent = false;
mAdjustScrollerOnUpEvent = true; mAdjustScrollerOnUpEvent = true;
if (mSelectorWheelState == SELECTOR_WHEEL_STATE_LARGE) { if (mSelectorWheelState == SELECTOR_WHEEL_STATE_LARGE) {
mSelectorWheelPaint.setAlpha(SELECTOR_WHEEL_BRIGHT_ALPHA);
boolean scrollersFinished = mFlingScroller.isFinished() boolean scrollersFinished = mFlingScroller.isFinished()
&& mAdjustScroller.isFinished(); && mAdjustScroller.isFinished();
if (!scrollersFinished) { if (!scrollersFinished) {
@@ -1597,23 +1598,11 @@ public class NumberPicker extends LinearLayout {
*/ */
private void fling(int velocityY) { private void fling(int velocityY) {
mPreviousScrollerY = 0; mPreviousScrollerY = 0;
Scroller flingScroller = mFlingScroller;
if (mWrapSelectorWheel) { if (velocityY > 0) {
if (velocityY > 0) { mFlingScroller.fling(0, 0, 0, velocityY, 0, 0, 0, Integer.MAX_VALUE);
flingScroller.fling(0, 0, 0, velocityY, 0, 0, 0, Integer.MAX_VALUE);
} else {
flingScroller.fling(0, Integer.MAX_VALUE, 0, velocityY, 0, 0, 0, Integer.MAX_VALUE);
}
} else { } else {
if (velocityY > 0) { mFlingScroller.fling(0, Integer.MAX_VALUE, 0, velocityY, 0, 0, 0, Integer.MAX_VALUE);
int maxY = mTextSize * (mValue - mMinValue);
flingScroller.fling(0, 0, 0, velocityY, 0, 0, 0, maxY);
} else {
int startY = mTextSize * (mMaxValue - mValue);
int maxY = startY;
flingScroller.fling(0, startY, 0, velocityY, 0, 0, 0, maxY);
}
} }
invalidate(); invalidate();