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

Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-11-10 23:54:45 +00:00
committed by Android (Google) Code Review
parent 85a5f23b7f 73c3068b0e
commit 993e3d2d40
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,7 +607,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl
*/ */
@Override @Override
public void onValueSelected(int pickerIndex, int newValue, boolean autoAdvance) { public void onValueSelected(int pickerIndex, int newValue, boolean autoAdvance) {
if (pickerIndex == HOUR_INDEX) { switch (pickerIndex) {
case HOUR_INDEX:
if (mAllowAutoAdvance && autoAdvance) { if (mAllowAutoAdvance && autoAdvance) {
updateHeaderHour(newValue, false); updateHeaderHour(newValue, false);
setCurrentItemShowing(MINUTE_INDEX, true, false); setCurrentItemShowing(MINUTE_INDEX, true, false);
@@ -615,15 +616,23 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl
} else { } else {
updateHeaderHour(newValue, true); updateHeaderHour(newValue, true);
} }
} else if (pickerIndex == MINUTE_INDEX){ break;
case MINUTE_INDEX:
updateHeaderMinute(newValue, true); updateHeaderMinute(newValue, true);
} else if (pickerIndex == AMPM_INDEX) { break;
case AMPM_INDEX:
updateAmPmLabelStates(newValue); updateAmPmLabelStates(newValue);
} else if (pickerIndex == ENABLE_PICKER_INDEX) { break;
case ENABLE_PICKER_INDEX:
if (!isTypedTimeFullyLegal()) { if (!isTypedTimeFullyLegal()) {
mTypedTimes.clear(); mTypedTimes.clear();
} }
finishKbMode(); finishKbMode();
break;
}
if (mOnTimeChangedListener != null) {
mOnTimeChangedListener.onTimeChanged(mDelegator, getCurrentHour(), getCurrentMinute());
} }
} }