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

Fix default style attr in DialogPreference subclass constructors

Browse Source 
BUG: 10751709
Change-Id: Ia7fa91e52881b46d39711d2adc43330014234a55
This commit is contained in:
Alan Viverette
2013-09-16 13:48:29 -07:00
parent 998c7007d1
commit 599d2a49e8
8 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -18718,9 +18718,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();
@@ -18750,8 +18751,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();

15
core/java/android/preference/DialogPreference.java
View File

@@ -64,10 +64,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) {
@@ -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.
*

8
core/java/android/preference/EditTextPreference.java
View File

@@ -49,10 +49,6 @@ public class EditTextPreference extends DialogPreference {
private EditText mEditText;
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);
}

2
core/java/android/preference/ListPreference.java
View File

@@ -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) {

2
core/java/android/preference/MultiCheckPreference.java
View File

@@ -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) {

2
core/java/android/preference/MultiSelectListPreference.java
View File

@@ -62,7 +62,7 @@ public class MultiSelectListPreference extends DialogPreference {
}
public MultiSelectListPreference(Context context, AttributeSet attrs) {
this(context, attrs, 0);
this(context, attrs, com.android.internal.R.attr.dialogPreferenceStyle);
}
public MultiSelectListPreference(Context context) {

6
core/java/android/preference/SeekBarDialogPreference.java
View File

@@ -49,7 +49,11 @@ public class SeekBarDialogPreference extends DialogPreference {
}
public SeekBarDialogPreference(Context context, AttributeSet attrs) {
this(context, attrs, 0);
this(context, attrs, com.android.internal.R.attr.dialogPreferenceStyle);
}
public SeekBarDialogPreference(Context context) {
this(context, null);
}
// Allow subclasses to override the action buttons

10
core/java/com/android/internal/preference/YesNoPreference.java
View File

@@ -31,19 +31,19 @@ import android.util.AttributeSet;
*/
public class YesNoPreference extends DialogPreference {
private boolean mWasPositiveResult;
public YesNoPreference(Context context, AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}
public YesNoPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
public YesNoPreference(Context context, AttributeSet attrs, int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}
public YesNoPreference(Context context, AttributeSet attrs) {
this(context, attrs, com.android.internal.R.attr.yesNoPreferenceStyle);
}
public YesNoPreference(Context context) {
this(context, null);
}