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

Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-11-19 15:50:19 -08:00
committed by Android (Google) Code Review
parent aaec726948 7018cfdc05
commit e9812bae0e
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1284,7 +1284,12 @@ public class NumberPicker extends LinearLayout {
/** /**
* Sets the min value of the picker. * Sets the min value of the picker.
* *
* @param minValue The min value. * @param minValue The min value inclusive.
*
* <strong>Note:</strong> The length of the displayed values array
* set via {@link #setDisplayedValues(String[])} must be equal to the
* range of selectable numbers which is equal to
* {@link #getMaxValue()} - {@link #getMinValue()} + 1.
*/ */
public void setMinValue(int minValue) { public void setMinValue(int minValue) {
if (mMinValue == minValue) { if (mMinValue == minValue) {
@@ -1317,7 +1322,12 @@ public class NumberPicker extends LinearLayout {
/** /**
* Sets the max value of the picker. * Sets the max value of the picker.
* *
* @param maxValue The max value. * @param maxValue The max value inclusive.
*
* <strong>Note:</strong> The length of the displayed values array
* set via {@link #setDisplayedValues(String[])} must be equal to the
* range of selectable numbers which is equal to
* {@link #getMaxValue()} - {@link #getMinValue()} + 1.
*/ */
public void setMaxValue(int maxValue) { public void setMaxValue(int maxValue) {
if (mMaxValue == maxValue) { if (mMaxValue == maxValue) {
@@ -1351,6 +1361,10 @@ public class NumberPicker extends LinearLayout {
* Sets the values to be displayed. * Sets the values to be displayed.
* *
* @param displayedValues The displayed values. * @param displayedValues The displayed values.
*
* <strong>Note:</strong> The length of the displayed values array
* must be equal to the range of selectable numbers which is equal to
* {@link #getMaxValue()} - {@link #getMinValue()} + 1.
*/ */
public void setDisplayedValues(String[] displayedValues) { public void setDisplayedValues(String[] displayedValues) {
if (mDisplayedValues == displayedValues) { if (mDisplayedValues == displayedValues) {
@@ -1361,14 +1375,6 @@ public class NumberPicker extends LinearLayout {
// Allow text entry rather than strictly numeric entry. // Allow text entry rather than strictly numeric entry.
mInputText.setRawInputType(InputType.TYPE_CLASS_TEXT mInputText.setRawInputType(InputType.TYPE_CLASS_TEXT
| InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); | 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 { } else {
mInputText.setRawInputType(InputType.TYPE_CLASS_NUMBER); mInputText.setRawInputType(InputType.TYPE_CLASS_NUMBER);
} }