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

am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev

Browse Source 
* commit '993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88':
  Call OnTimeChangedListener when new TimePicker values are selected
This commit is contained in:
Alan Viverette
2014-11-10 23:57:55 +00:00
committed by Android Git Automerger
parent b782ccd832 993e3d2d40
commit e1362d1170
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,23 +607,32 @@ 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) {
if (mAllowAutoAdvance && autoAdvance) { case HOUR_INDEX:
updateHeaderHour(newValue, false); if (mAllowAutoAdvance && autoAdvance) {
setCurrentItemShowing(MINUTE_INDEX, true, false); updateHeaderHour(newValue, false);
mDelegator.announceForAccessibility(newValue + ". " + mSelectMinutes); setCurrentItemShowing(MINUTE_INDEX, true, false);
} else { mDelegator.announceForAccessibility(newValue + ". " + mSelectMinutes);
updateHeaderHour(newValue, true); } else {
} updateHeaderHour(newValue, true);
} else if (pickerIndex == MINUTE_INDEX){ }
updateHeaderMinute(newValue, true); break;
} else if (pickerIndex == AMPM_INDEX) { case MINUTE_INDEX:
updateAmPmLabelStates(newValue); updateHeaderMinute(newValue, true);
} else if (pickerIndex == ENABLE_PICKER_INDEX) { break;
if (!isTypedTimeFullyLegal()) { case AMPM_INDEX:
mTypedTimes.clear(); updateAmPmLabelStates(newValue);
} break;
finishKbMode(); case ENABLE_PICKER_INDEX:
if (!isTypedTimeFullyLegal()) {
mTypedTimes.clear();
}
finishKbMode();
break;
}
if (mOnTimeChangedListener != null) {
mOnTimeChangedListener.onTimeChanged(mDelegator, getCurrentHour(), getCurrentMinute());
} }
} }