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

Commit 18814b4c authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 9ab60279: merge from open-source master 

Merge commit '9ab60279'

* commit '9ab60279':
  Replaced deprecated setButton Methodcalls
parents b9b918d6 9ab60279

core/java/android/app/DatePickerDialog.java

+15 −16
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.DialogInterface; 
import android.content.DialogInterface.OnClickListener;

import android.os.Bundle;

import android.text.TextUtils.TruncateAt;

import android.text.format.DateFormat;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.DatePicker;
@@ -112,8 +111,8 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener, 
        mCalendar = Calendar.getInstance();

        updateTitle(mInitialYear, mInitialMonth, mInitialDay);



        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 =