diff options
8 files changed, 29 insertions, 21 deletions
diff --git a/api/current.txt b/api/current.txt index 505f7bb..91d8afd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java index dc1f965..5275bc0 100644 --- a/core/java/android/preference/DialogPreference.java +++ b/core/java/android/preference/DialogPreference.java @@ -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. * diff --git a/core/java/android/preference/EditTextPreference.java b/core/java/android/preference/EditTextPreference.java index d5d339b..ff37042 100644 --- a/core/java/android/preference/EditTextPreference.java +++ b/core/java/android/preference/EditTextPreference.java @@ -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); } diff --git a/core/java/android/preference/ListPreference.java b/core/java/android/preference/ListPreference.java index fad75db..8081a54 100644 --- a/core/java/android/preference/ListPreference.java +++ b/core/java/android/preference/ListPreference.java @@ -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) { diff --git a/core/java/android/preference/MultiCheckPreference.java b/core/java/android/preference/MultiCheckPreference.java index ad39d24..57c906d 100644 --- a/core/java/android/preference/MultiCheckPreference.java +++ b/core/java/android/preference/MultiCheckPreference.java @@ -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) { diff --git a/core/java/android/preference/MultiSelectListPreference.java b/core/java/android/preference/MultiSelectListPreference.java index 82ca646..6c4c20f 100644 --- a/core/java/android/preference/MultiSelectListPreference.java +++ b/core/java/android/preference/MultiSelectListPreference.java @@ -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) { diff --git a/core/java/android/preference/SeekBarDialogPreference.java b/core/java/android/preference/SeekBarDialogPreference.java index 0c3c496..9a08827 100644 --- a/core/java/android/preference/SeekBarDialogPreference.java +++ b/core/java/android/preference/SeekBarDialogPreference.java @@ -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 diff --git a/core/java/com/android/internal/preference/YesNoPreference.java b/core/java/com/android/internal/preference/YesNoPreference.java index 61d1d75..7abf416 100644 --- a/core/java/com/android/internal/preference/YesNoPreference.java +++ b/core/java/com/android/internal/preference/YesNoPreference.java @@ -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); } |