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

Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-09-28 14:08:00 -07:00
committed by Android (Google) Code Review
parent 94ffe8739e a1410e6789
commit 07ddb460af
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1361,6 +1361,14 @@ public class NumberPicker extends LinearLayout {
// Allow text entry rather than strictly numeric entry.
mInputText.setRawInputType(InputType.TYPE_CLASS_TEXT
| InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
// Make sure the min, max, respect the size of the displayed
// values. This will take care of the current value as well.
if (getMinValue() >= displayedValues.length) {
setMinValue(0);
}
if (getMaxValue() >= displayedValues.length) {
setMaxValue(displayedValues.length - 1);
}
} else {
mInputText.setRawInputType(InputType.TYPE_CLASS_NUMBER);
}