diff options
author | Scott Kennedy <skennedy@google.com> | 2015-02-28 18:12:39 -0800 |
---|---|---|
committer | Scott Kennedy <skennedy@google.com> | 2015-03-02 11:11:22 -0800 |
commit | a09b3c940e98b8606a16a94b48b6d0121d9d3635 (patch) | |
tree | 4c4c3838cba13dad2ae459197483872ba546a8ee /src/com | |
parent | 70ca047b61c72f1670d52d16d8d0deb341277f38 (diff) | |
download | datetimepicker-a09b3c940e98b8606a16a94b48b6d0121d9d3635.tar.gz |
Remove the "white" color and use Android's
Change-Id: I3b05f376db201e441759400c6341eb1e53ffbc60
Diffstat (limited to 'src/com')
5 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/datetimepicker/date/MonthView.java b/src/com/android/datetimepicker/date/MonthView.java index e4d1f09..00711f3 100644 --- a/src/com/android/datetimepicker/date/MonthView.java +++ b/src/com/android/datetimepicker/date/MonthView.java @@ -204,7 +204,7 @@ public abstract class MonthView extends View { mDayTextColor = res.getColor(R.color.date_picker_text_normal); mTodayNumberColor = res.getColor(R.color.blue); mDisabledDayTextColor = res.getColor(R.color.date_picker_text_disabled); - mMonthTitleColor = res.getColor(R.color.white); + mMonthTitleColor = res.getColor(android.R.color.white); mMonthTitleBGColor = res.getColor(R.color.circle_background); mStringBuilder = new StringBuilder(50); diff --git a/src/com/android/datetimepicker/time/AmPmCirclesView.java b/src/com/android/datetimepicker/time/AmPmCirclesView.java index c62aebf..902abd9 100644 --- a/src/com/android/datetimepicker/time/AmPmCirclesView.java +++ b/src/com/android/datetimepicker/time/AmPmCirclesView.java @@ -74,7 +74,7 @@ public class AmPmCirclesView extends View { } Resources res = context.getResources(); - mUnselectedColor = res.getColor(R.color.white); + mUnselectedColor = res.getColor(android.R.color.white); mSelectedColor = res.getColor(R.color.blue); mAmPmTextColor = res.getColor(R.color.ampm_text_color); mSelectedAlpha = SELECTED_ALPHA; @@ -103,10 +103,10 @@ public class AmPmCirclesView extends View { if (themeDark) { mUnselectedColor = res.getColor(R.color.dark_gray); mSelectedColor = res.getColor(R.color.red); - mAmPmTextColor = res.getColor(R.color.white); + mAmPmTextColor = res.getColor(android.R.color.white); mSelectedAlpha = SELECTED_ALPHA_THEME_DARK; } else { - mUnselectedColor = res.getColor(R.color.white); + mUnselectedColor = res.getColor(android.R.color.white); mSelectedColor = res.getColor(R.color.blue); mAmPmTextColor = res.getColor(R.color.ampm_text_color); mSelectedAlpha = SELECTED_ALPHA; diff --git a/src/com/android/datetimepicker/time/CircleView.java b/src/com/android/datetimepicker/time/CircleView.java index 549db42..1dd4eea 100644 --- a/src/com/android/datetimepicker/time/CircleView.java +++ b/src/com/android/datetimepicker/time/CircleView.java @@ -48,7 +48,7 @@ public class CircleView extends View { super(context); Resources res = context.getResources(); - mCircleColor = res.getColor(R.color.white); + mCircleColor = res.getColor(android.R.color.white); mDotColor = res.getColor(R.color.numbers_text_color); mPaint.setAntiAlias(true); @@ -82,7 +82,7 @@ public class CircleView extends View { mCircleColor = res.getColor(R.color.dark_gray); mDotColor = res.getColor(R.color.light_gray); } else { - mCircleColor = res.getColor(R.color.white); + mCircleColor = res.getColor(android.R.color.white); mDotColor = res.getColor(R.color.numbers_text_color); } } diff --git a/src/com/android/datetimepicker/time/RadialTextsView.java b/src/com/android/datetimepicker/time/RadialTextsView.java index 9acc8c5..684e8f5 100644 --- a/src/com/android/datetimepicker/time/RadialTextsView.java +++ b/src/com/android/datetimepicker/time/RadialTextsView.java @@ -147,7 +147,7 @@ public class RadialTextsView extends View { Resources res = context.getResources(); int textColor; if (themeDark) { - textColor = res.getColor(R.color.white); + textColor = res.getColor(android.R.color.white); } else { textColor = res.getColor(R.color.numbers_text_color); } diff --git a/src/com/android/datetimepicker/time/TimePickerDialog.java b/src/com/android/datetimepicker/time/TimePickerDialog.java index feb9a8a..c7661ad 100644 --- a/src/com/android/datetimepicker/time/TimePickerDialog.java +++ b/src/com/android/datetimepicker/time/TimePickerDialog.java @@ -201,7 +201,8 @@ public class TimePickerDialog extends DialogFragment implements OnValueSelectedL mMinutePickerDescription = res.getString(R.string.minute_picker_description); mSelectMinutes = res.getString(R.string.select_minutes); mSelectedColor = res.getColor(mThemeDark? R.color.red : R.color.blue); - mUnselectedColor = res.getColor(mThemeDark? R.color.white : R.color.numbers_text_color); + mUnselectedColor = + res.getColor(mThemeDark? android.R.color.white : R.color.numbers_text_color); mHourView = (TextView) view.findViewById(R.id.hours); mHourView.setOnKeyListener(keyboardListener); @@ -314,7 +315,7 @@ public class TimePickerDialog extends DialogFragment implements OnValueSelectedL // Set the theme at the end so that the initialize()s above don't counteract the theme. mTimePicker.setTheme(getActivity().getApplicationContext(), mThemeDark); // Prepare some colors to use. - int white = res.getColor(R.color.white); + int white = res.getColor(android.R.color.white); int circleBackground = res.getColor(R.color.circle_background); int line = res.getColor(R.color.line_background); int timeDisplay = res.getColor(R.color.numbers_text_color); |