diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-01-18 19:39:57 -0800 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-01-19 12:35:17 -0800 |
| commit | 4243dc394d89a93cb207efa36e9755c2424d688b (patch) | |
| tree | c99ab6c9c84c97ba61bdef7209afc90ced5fa8b3 /core/java/android/widget/DatePicker.java | |
| parent | 9f7e83b4062beba5b3ce7d3693505ec082f7d3f6 (diff) | |
Updated the Time/Date pickers to be backwards compatible
bug:3349400
Change-Id: I2a3dda82caf7de0ed203306c89ee774b94b7d82e
Diffstat (limited to 'core/java/android/widget/DatePicker.java')
| -rw-r--r-- | core/java/android/widget/DatePicker.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index 2c530050e736..af5de8a76752 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -129,27 +129,30 @@ public class DatePicker extends FrameLayout { } public DatePicker(Context context, AttributeSet attrs) { - this(context, attrs, 0); + this(context, attrs, R.attr.datePickerStyle); } public DatePicker(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - TypedArray attributesArray = context.obtainStyledAttributes(attrs, R.styleable.DatePicker); + TypedArray attributesArray = context.obtainStyledAttributes(attrs, R.styleable.DatePicker, + defStyle, 0); boolean spinnersShown = attributesArray.getBoolean(R.styleable.DatePicker_spinnersShown, DEFAULT_SPINNERS_SHOWN); boolean calendarViewShown = attributesArray.getBoolean( R.styleable.DatePicker_calendarViewShown, DEFAULT_CALENDAR_VIEW_SHOWN); - int startYear = attributesArray - .getInt(R.styleable.DatePicker_startYear, DEFAULT_START_YEAR); + int startYear = attributesArray.getInt(R.styleable.DatePicker_startYear, + DEFAULT_START_YEAR); int endYear = attributesArray.getInt(R.styleable.DatePicker_endYear, DEFAULT_END_YEAR); String minDate = attributesArray.getString(R.styleable.DatePicker_minDate); String maxDate = attributesArray.getString(R.styleable.DatePicker_maxDate); + int layoutResourceId = attributesArray.getResourceId(R.styleable.DatePicker_layout, + R.layout.date_picker); attributesArray.recycle(); LayoutInflater inflater = (LayoutInflater) context .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.date_picker, this, true); + inflater.inflate(layoutResourceId, this, true); OnValueChangedListener onChangeListener = new OnValueChangedListener() { public void onValueChange(NumberPicker picker, int oldVal, int newVal) { |