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

Commit 379c2151 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix default style attr in DialogPreference subclass constructors"

parents 1c7a180f 599d2a49

api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -18725,9 +18725,10 @@ package android.preference { 
  }















  public abstract class DialogPreference extends android.preference.Preference implements android.content.DialogInterface.OnClickListener android.content.DialogInterface.OnDismissListener android.preference.PreferenceManager.OnActivityDestroyListener {













    ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int);















    ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int, int);













    ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int);















    ctor public DialogPreference(android.content.Context, android.util.AttributeSet);













    ctor public DialogPreference(android.content.Context);















    method public android.app.Dialog getDialog();















    method public android.graphics.drawable.Drawable getDialogIcon();















    method public int getDialogLayoutResource();










@@ -18757,8 +18758,8 @@ package android.preference {













  }





























  public class EditTextPreference extends android.preference.DialogPreference {













    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet, int);















    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet, int, int);













    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet, int);















    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet);















    ctor public EditTextPreference(android.content.Context);















    method public android.widget.EditText getEditText();

























core/java/android/preference/DialogPreference.java



+9
−6






























Original line number
Diff line number
Diff line








@@ -65,10 +65,6 @@ public abstract class DialogPreference extends Preference implements













    /** Which button was clicked. */















    private int mWhichButtonClicked;





























    public DialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {













        this(context, attrs, defStyleAttr, 0);













    }





























    public DialogPreference(















            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {















        super(context, attrs, defStyleAttr, defStyleRes);









@@ -88,13 +84,20 @@ public abstract class DialogPreference extends Preference implements













        mDialogLayoutResId = a.getResourceId(com.android.internal.R.styleable.DialogPreference_dialogLayout,















                mDialogLayoutResId);















        a.recycle();













    }





























    public DialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {













        this(context, attrs, defStyleAttr, 0);















    }































    public DialogPreference(Context context, AttributeSet attrs) {















        this(context, attrs, com.android.internal.R.attr.dialogPreferenceStyle);















    }





























    public DialogPreference(Context context) {













        this(context, null);













    }





























    /**















     * Sets the title of the dialog. This will be shown on subsequent dialogs.















     * 

































core/java/android/preference/EditTextPreference.java



+4
−4






























Original line number
Diff line number
Diff line








@@ -50,10 +50,6 @@ public class EditTextPreference extends DialogPreference {













    















    private String mText;





























    public EditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {













        this(context, attrs, defStyleAttr, 0);













    }





























    public EditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {















        super(context, attrs, defStyleAttr, defStyleRes);















        









@@ -71,6 +67,10 @@ public class EditTextPreference extends DialogPreference {













        mEditText.setEnabled(true);















    }





























    public EditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {













        this(context, attrs, defStyleAttr, 0);













    }





























    public EditTextPreference(Context context, AttributeSet attrs) {















        this(context, attrs, com.android.internal.R.attr.editTextPreferenceStyle);















    }

































core/java/android/preference/ListPreference.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -66,7 +66,7 @@ public class ListPreference extends DialogPreference {













    }































    public ListPreference(Context context, AttributeSet attrs) {













        this(context, attrs, 0);













        this(context, attrs, com.android.internal.R.attr.dialogPreferenceStyle);















    }































    public ListPreference(Context context) {

































core/java/android/preference/MultiCheckPreference.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -69,7 +69,7 @@ public class MultiCheckPreference extends DialogPreference {













    }































    public MultiCheckPreference(Context context, AttributeSet attrs) {













        this(context, attrs, 0);













        this(context, attrs, com.android.internal.R.attr.dialogPreferenceStyle);















    }































    public MultiCheckPreference(Context context) {