Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27dfb307 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
parents 9ab60279 45988040

core/java/android/app/TimePickerDialog.java

+14 −13
Original line number Diff line number Diff line
@@ -99,8 +99,9 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener, 
        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 =