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

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

@@ -99,8 +99,9 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
mCalendar = Calendar.getInstance(); mCalendar = Calendar.getInstance();
updateTitle(mInitialHourOfDay, mInitialMinute); updateTitle(mInitialHourOfDay, mInitialMinute);
setButton(context.getText(R.string.date_time_set), this); setButton(BUTTON_POSITIVE, context.getText(R.string.date_time_set), this);
setButton2(context.getText(R.string.cancel), (OnClickListener) null); setButton(BUTTON_NEGATIVE, context.getText(R.string.cancel),
(OnClickListener) null);
setIcon(R.drawable.ic_dialog_time); setIcon(R.drawable.ic_dialog_time);
LayoutInflater inflater = LayoutInflater inflater =