Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53303da0 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

Merge commit '8bcbebd4' into gingerbread-plus-aosp

* commit '8bcbebd4':
  Fix bug 3024080 - Date picker month field uses numeric text field
parents ea58d1ba 8bcbebd4

core/java/android/widget/DatePicker.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -114,9 +114,11 @@ public class DatePicker extends FrameLayout { 
            for (int i = 0; i < months.length; i++) {

            for (int i = 0; i < months.length; i++) {

                months[i] = String.valueOf(i + 1);

                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.setSpeed(200);

        mMonthPicker.setOnChangeListener(new OnChangedListener() {

        mMonthPicker.setOnChangeListener(new OnChangedListener() {

            public void onChanged(NumberPicker picker, int oldVal, int newVal) {

            public void onChanged(NumberPicker picker, int oldVal, int newVal) {

core/java/android/widget/NumberPicker.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package android.widget;

package android.widget;





import com.android.internal.R;



import android.annotation.Widget;

import android.annotation.Widget;

import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.Handler;
@@ -26,14 +28,6 @@ import android.text.method.NumberKeyListener; 
import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

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

 * A view for selecting a number
@@ -274,6 +268,12 @@ public class NumberPicker extends LinearLayout { 
        mEnd = end;

        mEnd = end;

        mCurrent = start;

        mCurrent = start;

        updateView();

        updateView();



        if (displayedValues != null) {

            // Allow text entry rather than strictly numeric entry.

            mText.setRawInputType(InputType.TYPE_CLASS_TEXT |

                    InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);

        }

    }

    }





    /**

    /**