diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-09-28 14:08:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 14:08:00 -0700 |
| commit | 07ddb460afca09640e18b28bfedcaecfe5b2a838 (patch) | |
| tree | 1418813f7b7a8871dc310f399047ea68f9aa5993 /core/java/android | |
| parent | 94ffe8739e2b0a9a7d2f0daa0bb90652fbdfd33b (diff) | |
| parent | a1410e6789ce72bc423793315a51aea8b6bad6c7 (diff) | |
| download | frameworks_base-07ddb460afca09640e18b28bfedcaecfe5b2a838.zip frameworks_base-07ddb460afca09640e18b28bfedcaecfe5b2a838.tar.gz frameworks_base-07ddb460afca09640e18b28bfedcaecfe5b2a838.tar.bz2 | |
Merge "NumberPicker should adjust min and max when displayed values are set." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/NumberPicker.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 704f6b6..4918e48 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -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); } |