Merge "Correctly validate numbers when pasted in NumberPicker. Bug #2258525" (0a9355bc) · Commits · e / os / android_frameworks_base

core/java/android/widget/NumberPicker.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -473,10 +473,13 @@ public class NumberPicker extends LinearLayout {

		private int getSelectedPos(String str) {
		if (mDisplayedValues == null) {
		try {
		return Integer.parseInt(str);
		} catch (NumberFormatException e) {
		/* Ignore as if it's not a number we don't care */
		}
		} else {
		for (int i = 0; i < mDisplayedValues.length; i++) {

		/* Don't force the user to type in jan when ja will do */
		str = str.toLowerCase();
		if (mDisplayedValues[i].toLowerCase().startsWith(str)) {