diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-03 20:14:21 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-09-03 20:14:21 -0700 |
| commit | ba9bf41a77261471a4dc9d7964aec41726b4e4e6 (patch) | |
| tree | 05faa2ee8cec92a67d1a2bf20b9cf6f7304c0438 /core/java/android/widget/RadialTimePickerView.java | |
| parent | b10e39e7166e2c4854a3adb2c2d8fa9c72d816bf (diff) | |
Fix AM/PM text i18n and clean up keyboard support in time picker
Also updates date picker to use drawable for the header background to
match the implementation in time picker. The time picker background
now supports showing a focused state ripple.
BUG: 17344077
BUG: 16227517
Change-Id: Ida715badb4a151fc16edd91fd4a0dae32953c99e
Diffstat (limited to 'core/java/android/widget/RadialTimePickerView.java')
| -rw-r--r-- | core/java/android/widget/RadialTimePickerView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java index adca4ccdaaed..d2f68d07fbbd 100644 --- a/core/java/android/widget/RadialTimePickerView.java +++ b/core/java/android/widget/RadialTimePickerView.java @@ -458,6 +458,7 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { a.recycle(); setOnTouchListener(this); + setClickable(true); // Initial values final Calendar calendar = Calendar.getInstance(Locale.getDefault()); @@ -612,9 +613,9 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mMinutesTexts[i] = String.format("%02d", MINUTES_NUMBERS[i]); } - String[] amPmTexts = new DateFormatSymbols().getAmPmStrings(); - mAmPmText[AM] = amPmTexts[0]; - mAmPmText[PM] = amPmTexts[1]; + String[] amPmStrings = TimePickerClockDelegate.getAmPmStrings(mContext); + mAmPmText[AM] = amPmStrings[0]; + mAmPmText[PM] = amPmStrings[1]; } private void initData() { |