Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include current selection mode in TimePicker event text" into nyc-dev

Browse Source
This commit is contained in:
Alan Viverette
2016-04-12 21:18:14 +00:00
committed by Android (Google) Code Review
parent 1ef8aef260 b0f5461eec
commit 20f2b38ea4
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/RadialTimePickerView.java
View File

@@ -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;

20
core/java/android/widget/TimePickerClockDelegate.java
View File

@@ -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);
}
/**