diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-06 15:48:55 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-06-06 15:48:55 -0700 |
| commit | 830960cce032a1b0dc0cf54bcc44ffa339388c21 (patch) | |
| tree | 8729b267ce649cb0593202c30748cd94132a7f84 /core/java/android/widget/TimePickerDelegate.java | |
| parent | 052027dc9068708e5d166853f434274188a48753 (diff) | |
Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
Diffstat (limited to 'core/java/android/widget/TimePickerDelegate.java')
| -rw-r--r-- | core/java/android/widget/TimePickerDelegate.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/TimePickerDelegate.java b/core/java/android/widget/TimePickerDelegate.java index ba93ee560a56..bf3971cbbf4e 100644 --- a/core/java/android/widget/TimePickerDelegate.java +++ b/core/java/android/widget/TimePickerDelegate.java @@ -140,12 +140,12 @@ class TimePickerDelegate extends TimePicker.AbstractTimePickerDelegate implement mSelectMinutes = res.getString(R.string.select_minutes); mHeaderSelectedColor = a.getColor(R.styleable.TimePicker_headerSelectedTextColor, - R.color.timepicker_default_selector_color_quantum); + R.color.timepicker_default_selector_color_material); - mHeaderUnSelectedColor = getUnselectedColor(R.color.timepicker_default_text_color_quantum); + mHeaderUnSelectedColor = getUnselectedColor(R.color.timepicker_default_text_color_material); if (mHeaderUnSelectedColor == -1) { mHeaderUnSelectedColor = a.getColor(R.styleable.TimePicker_headerUnselectedTextColor, - R.color.timepicker_default_text_color_quantum); + R.color.timepicker_default_text_color_material); } final int headerBackgroundColor = a.getColor( @@ -295,7 +295,7 @@ class TimePickerDelegate extends TimePicker.AbstractTimePickerDelegate implement TypedArray a = mContext.obtainStyledAttributes(TEXT_APPEARANCE_TIME_LABEL_ATTR); final int textAppearanceResId = a.getResourceId(0, 0); tempView.setTextAppearance(mContext, (textAppearanceResId != 0) ? - textAppearanceResId : R.style.TextAppearance_Quantum_TimePicker_TimeLabel); + textAppearanceResId : R.style.TextAppearance_Material_TimePicker_TimeLabel); a.recycle(); ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); |