diff options
| -rw-r--r-- | core/java/android/widget/RadialTimePickerView.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/TimePickerClockDelegate.java | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java index 72202567d9bd..24d2c8ee8fe6 100644 --- a/core/java/android/widget/RadialTimePickerView.java +++ b/core/java/android/widget/RadialTimePickerView.java @@ -58,8 +58,8 @@ public class RadialTimePickerView extends View { private static final String TAG = "RadialTimePickerView"; - private static final int HOURS = 0; - private static final int MINUTES = 1; + public static final int HOURS = 0; + public static final int MINUTES = 1; private static final int HOURS_INNER = 2; private static final int SELECTOR_CIRCLE = 0; 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); } /** |