diff options
author | Adam Powell <adamp@android.com> | 2013-02-06 22:11:19 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-06 22:11:19 +0000 |
commit | 21af9a08465c4927aab9db30efdfcf5ee8f52410 (patch) | |
tree | 8a4c826300a862f102fdc0f92afe64d3f697e850 | |
parent | fd5a0b3681499cbee0d1156b3b6f93fc91320848 (diff) | |
parent | 6d8a99fecc5dd3aec502c0419af61e8d2a3c398d (diff) | |
download | frameworks_base-21af9a08465c4927aab9db30efdfcf5ee8f52410.zip frameworks_base-21af9a08465c4927aab9db30efdfcf5ee8f52410.tar.gz frameworks_base-21af9a08465c4927aab9db30efdfcf5ee8f52410.tar.bz2 |
Merge "avoid multiple-"0" to exceed the length of upper bound"
-rw-r--r-- | core/java/android/widget/NumberPicker.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 74ded18..2ac5a12 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -1969,8 +1969,10 @@ public class NumberPicker extends LinearLayout { * Ensure the user can't type in a value greater than the max * allowed. We have to allow less than min as the user might * want to delete some numbers and then type a new number. + * And prevent multiple-"0" that exceeds the length of upper + * bound number. */ - if (val > mMaxValue) { + if (val > mMaxValue || result.length() > String.valueOf(mMaxValue).length()) { return ""; } else { return filtered; |