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

merge from open-source master

Browse Source 
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
This commit is contained in:
The Android Open Source Project
2010-07-19 12:49:39 -07:00
parent 9ab60279fd 4598804045
commit 27dfb3070a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ import java.util.Calendar;
/**
* A dialog that prompts the user for the time of day using a {@link TimePicker}.
*/
public class TimePickerDialog extends AlertDialog implements OnClickListener,
public class TimePickerDialog extends AlertDialog implements OnClickListener,
OnTimeChangedListener {
/**
@@ -53,12 +53,12 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
private static final String HOUR = "hour";
private static final String MINUTE = "minute";
private static final String IS_24_HOUR = "is24hour";
private final TimePicker mTimePicker;
private final OnTimeSetListener mCallback;
private final Calendar mCalendar;
private final java.text.DateFormat mDateFormat;
int mInitialHourOfDay;
int mInitialMinute;
boolean mIs24HourView;
@@ -98,12 +98,13 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
mDateFormat = DateFormat.getTimeFormat(context);
mCalendar = Calendar.getInstance();
updateTitle(mInitialHourOfDay, mInitialMinute);
setButton(context.getText(R.string.date_time_set), this);
setButton2(context.getText(R.string.cancel), (OnClickListener) null);
setButton(BUTTON_POSITIVE, context.getText(R.string.date_time_set), this);
setButton(BUTTON_NEGATIVE, context.getText(R.string.cancel),
(OnClickListener) null);
setIcon(R.drawable.ic_dialog_time);
LayoutInflater inflater =
LayoutInflater inflater =
(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = inflater.inflate(R.layout.time_picker_dialog, null);
setView(view);
@@ -115,11 +116,11 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
mTimePicker.setIs24HourView(mIs24HourView);
mTimePicker.setOnTimeChangedListener(this);
}
public void onClick(DialogInterface dialog, int which) {
if (mCallback != null) {
mTimePicker.clearFocus();
mCallback.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
mCallback.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
mTimePicker.getCurrentMinute());
}
}
@@ -127,7 +128,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
updateTitle(hourOfDay, minute);
}
public void updateTime(int hourOfDay, int minutOfHour) {
mTimePicker.setCurrentHour(hourOfDay);
mTimePicker.setCurrentMinute(minutOfHour);
@@ -138,7 +139,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
mCalendar.set(Calendar.MINUTE, minute);
setTitle(mDateFormat.format(mCalendar.getTime()));
}
@Override
public Bundle onSaveInstanceState() {
Bundle state = super.onSaveInstanceState();
@@ -147,7 +148,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
state.putBoolean(IS_24_HOUR, mTimePicker.is24HourView());
return state;
}
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);