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

am 59cce94e: Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb

Browse Source 
* commit '59cce94eb8cecd484b467d7b855817116e4b13fc':
  Catching some edge cases while flinging/scrolling in NumberPicker
This commit is contained in:
Svetoslav Ganov
2011-01-17 12:54:14 -08:00
committed by Android Git Automerger
parent 74871f9c37 59cce94eb8
commit be0a092c87
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -754,7 +754,7 @@ public class NumberPicker extends LinearLayout {
return;
}
mCurrentScrollOffset += y;
while (mCurrentScrollOffset - mInitialScrollOffset > mSelectorElementHeight) {
while (mCurrentScrollOffset - mInitialScrollOffset >= mSelectorElementHeight) {
mCurrentScrollOffset -= mSelectorElementHeight;
decrementSelectorIndices(selectorIndices);
changeCurrent(selectorIndices[SELECTOR_MIDDLE_ITEM_INDEX]);
@@ -762,7 +762,7 @@ public class NumberPicker extends LinearLayout {
mCurrentScrollOffset = mInitialScrollOffset;
}
}
while (mCurrentScrollOffset - mInitialScrollOffset < -mSelectorElementHeight) {
while (mCurrentScrollOffset - mInitialScrollOffset <= -mSelectorElementHeight) {
mCurrentScrollOffset += mSelectorElementHeight;
incrementScrollSelectorIndices(selectorIndices);
changeCurrent(selectorIndices[SELECTOR_MIDDLE_ITEM_INDEX]);
@@ -1147,8 +1147,8 @@ public class NumberPicker extends LinearLayout {
postAdjustScrollerCommand(0);
tryNotifyScrollListener(OnScrollListener.SCROLL_STATE_IDLE);
} else {
showInputControls();
updateInputTextView();
showInputControls();
}
}
@@ -1537,8 +1537,8 @@ public class NumberPicker extends LinearLayout {
public void run() {
mPreviousScrollerY = 0;
if (mInitialScrollOffset == mCurrentScrollOffset) {
showInputControls();
updateInputTextView();
showInputControls();
return;
}
// adjust to the closest value