am 53303da0: am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field

Merge commit '53303da0a78da2042ec60226ee290d2c903e6023'

* commit '53303da0a78da2042ec60226ee290d2c903e6023':
  Fix bug 3024080 - Date picker month field uses numeric text field

2 files changed, 11 insertions, 9 deletions

diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index 8aed454a4715..a3712902b85e 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -114,9 +114,11 @@ public class DatePicker extends FrameLayout {
             for (int i = 0; i < months.length; i++) {
                 months[i] = String.valueOf(i + 1);
             }
+            mMonthPicker.setRange(1, 12);
+        } else {
+            mMonthPicker.setRange(1, 12, months);
         }
 
-        mMonthPicker.setRange(1, 12, months);
         mMonthPicker.setSpeed(200);
         mMonthPicker.setOnChangeListener(new OnChangedListener() {
             public void onChanged(NumberPicker picker, int oldVal, int newVal) {
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index 582d9e4a104a..4482b5b26aeb 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -16,6 +16,8 @@
 
 package android.widget;
 
+import com.android.internal.R;
+
 import android.annotation.Widget;
 import android.content.Context;
 import android.os.Handler;
@@ -26,14 +28,6 @@ import android.text.method.NumberKeyListener;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnFocusChangeListener;
-import android.view.View.OnLongClickListener;
-import android.widget.TextView;
-import android.widget.LinearLayout;
-import android.widget.EditText;
-
-import com.android.internal.R;
 
 /**
  * A view for selecting a number
@@ -274,6 +268,12 @@ public class NumberPicker extends LinearLayout {
         mEnd = end;
         mCurrent = start;
         updateView();
+
+        if (displayedValues != null) {
+            // Allow text entry rather than strictly numeric entry.
+            mText.setRawInputType(InputType.TYPE_CLASS_TEXT |
+                    InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        }
     }
 
     /**