Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 3024080 - Date picker month field uses numeric text field

Browse Source 
NumberPicker now uses text entry when displayed value strings are
provided.

Change-Id: I555a7d6b64ad6a5af131b3e1d8c638dcdb00d02c
This commit is contained in:
Adam Powell
2010-10-02 12:16:51 -07:00
parent e951ef07dd
commit 8bcbebd417
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/DatePicker.java
View File

@@ -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) {

16
core/java/android/widget/NumberPicker.java
View File

@@ -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);
}
}
/**