diff options
| author | Alan Viverette <alanv@google.com> | 2016-04-12 14:58:09 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2016-04-12 14:58:09 -0400 |
| commit | b0f5461eeca28d6c4be6ba1f826a43a8961f587e (patch) | |
| tree | a160ac272fc5110bc2b6ecdc2d3c42df18bf6f18 /core/java/android/widget/TimePickerClockDelegate.java | |
| parent | 68b19f2778989c3f4ae9eb2407f40c97e11fb57d (diff) | |
Include current selection mode in TimePicker event text
Bug: 23118708
Change-Id: I709f28674c7a959cdfb279f8643a07aa562d8fef
Diffstat (limited to 'core/java/android/widget/TimePickerClockDelegate.java')
| -rw-r--r-- | core/java/android/widget/TimePickerClockDelegate.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index 4a24e26a2828..0c3892d36aad 100644 --- a/core/java/android/widget/TimePickerClockDelegate.java +++ b/core/java/android/widget/TimePickerClockDelegate.java @@ -58,8 +58,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl private static final long DELAY_COMMIT_MILLIS = 2000; // Index used by RadialPickerLayout - private static final int HOUR_INDEX = 0; - private static final int MINUTE_INDEX = 1; + private static final int HOUR_INDEX = RadialTimePickerView.HOURS; + private static final int MINUTE_INDEX = RadialTimePickerView.MINUTES; // NOT a real index for the purpose of what's showing. private static final int AMPM_INDEX = 2; @@ -82,6 +82,10 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl private final Calendar mTempCalendar; + // Accessibility strings. + private final String mSelectHours; + private final String mSelectMinutes; + private boolean mIsEnabled = true; private boolean mAllowAutoAdvance; private int mInitialHourOfDay; @@ -89,10 +93,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl private boolean mIs24Hour; private boolean mIsAmPmAtStart; - // Accessibility strings. - private String mSelectHours; - private String mSelectMinutes; - // Localization data. private boolean mHourFormatShowLeadingZero; private boolean mHourFormatStartsAtZero; @@ -520,11 +520,15 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl } else { flags |= DateUtils.FORMAT_12HOUR; } + mTempCalendar.set(Calendar.HOUR_OF_DAY, getHour()); mTempCalendar.set(Calendar.MINUTE, getMinute()); - String selectedDate = DateUtils.formatDateTime(mContext, + + final String selectedTime = DateUtils.formatDateTime(mContext, mTempCalendar.getTimeInMillis(), flags); - event.getText().add(selectedDate); + final String selectionMode = mRadialTimePickerView.getCurrentItemShowing() == HOUR_INDEX ? + mSelectHours : mSelectMinutes; + event.getText().add(selectedTime + " " + selectionMode); } /** |