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

am 6d7771b5: Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev

Browse Source 
* commit '6d7771b575ec9303515128e98fcb67689414ac6e':
  Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()
This commit is contained in:
Fabrice Di Meglio
2013-08-27 12:28:43 -07:00
committed by Android Git Automerger
parent 3bc13da481 6d7771b575
commit 71de13128f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/TimePicker.java
View File

@@ -443,6 +443,10 @@ public class TimePicker extends FrameLayout {
* Set the current hour.
*/
public void setCurrentHour(Integer currentHour) {
setCurrentHour(currentHour, true);
}
private void setCurrentHour(Integer currentHour, boolean notifyTimeChanged) {
// why was Integer used in the first place?
if (currentHour == null || currentHour == getCurrentHour()) {
return;
@@ -463,7 +467,9 @@ public class TimePicker extends FrameLayout {
updateAmPmControl();
}
mHourSpinner.setValue(currentHour);
onTimeChanged();
if (notifyTimeChanged) {
onTimeChanged();
}
}
/**
@@ -481,8 +487,10 @@ public class TimePicker extends FrameLayout {
mIs24HourView = is24HourView;
getHourFormatData();
updateHourControl();
// set value after spinner range is updated
setCurrentHour(currentHour);
// set value after spinner range is updated - be aware that because mIs24HourView has
// changed then getCurrentHour() is not equal to the currentHour we cached before so
// explicitly ask for *not* propagating any onTimeChanged()
setCurrentHour(currentHour, false /* no onTimeChanged() */);
updateMinuteControl();
updateAmPmControl();
}