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

Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb

Browse Source
This commit is contained in:
Brian Muramatsu
2011-02-01 18:09:36 -08:00
committed by Android (Google) Code Review
parent 485d577af1 87879e8ef9
commit 1d696fa458
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/TimePickerDialog.java
View File

@@ -107,9 +107,9 @@ public class TimePickerDialog extends AlertDialog
mTimePicker = (TimePicker) view.findViewById(R.id.timePicker); mTimePicker = (TimePicker) view.findViewById(R.id.timePicker);
// initialize state // initialize state
mTimePicker.setIs24HourView(mIs24HourView);
mTimePicker.setCurrentHour(mInitialHourOfDay); mTimePicker.setCurrentHour(mInitialHourOfDay);
mTimePicker.setCurrentMinute(mInitialMinute); mTimePicker.setCurrentMinute(mInitialMinute);
mTimePicker.setIs24HourView(mIs24HourView);
mTimePicker.setOnTimeChangedListener(this); mTimePicker.setOnTimeChangedListener(this);
} }
@@ -144,8 +144,8 @@ public class TimePickerDialog extends AlertDialog
super.onRestoreInstanceState(savedInstanceState); super.onRestoreInstanceState(savedInstanceState);
int hour = savedInstanceState.getInt(HOUR); int hour = savedInstanceState.getInt(HOUR);
int minute = savedInstanceState.getInt(MINUTE); int minute = savedInstanceState.getInt(MINUTE);
mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));
mTimePicker.setCurrentHour(hour); mTimePicker.setCurrentHour(hour);
mTimePicker.setCurrentMinute(minute); mTimePicker.setCurrentMinute(minute);
mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));
} }
} }