Merge "Deprecates framework Preference classes" (e4205126) · Commits · e / os / android_frameworks_base

api/current.txt

100755 → 100644

+22 −22

Original line number	Diff line number	Diff line
		@@ -34633,14 +34633,14 @@ package android.os.strictmode {

		package android.preference {

		public class CheckBoxPreference extends android.preference.TwoStatePreference {
		public deprecated class CheckBoxPreference extends android.preference.TwoStatePreference {
		ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet, int);
		ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet);
		ctor public CheckBoxPreference(android.content.Context);
		}

		public abstract class DialogPreference extends android.preference.Preference implements android.content.DialogInterface.OnClickListener android.content.DialogInterface.OnDismissListener android.preference.PreferenceManager.OnActivityDestroyListener {
		public abstract deprecated 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, int);
		ctor public DialogPreference(android.content.Context, android.util.AttributeSet, int);
		ctor public DialogPreference(android.content.Context, android.util.AttributeSet);
		@@ -34673,7 +34673,7 @@ package android.preference {
		method protected void showDialog(android.os.Bundle);
		}

		public class EditTextPreference extends android.preference.DialogPreference {
		public deprecated class EditTextPreference extends android.preference.DialogPreference {
		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);
		@@ -34684,7 +34684,7 @@ package android.preference {
		method public void setText(java.lang.String);
		}

		public class ListPreference extends android.preference.DialogPreference {
		public deprecated class ListPreference extends android.preference.DialogPreference {
		ctor public ListPreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public ListPreference(android.content.Context, android.util.AttributeSet, int);
		ctor public ListPreference(android.content.Context, android.util.AttributeSet);
		@@ -34702,7 +34702,7 @@ package android.preference {
		method public void setValueIndex(int);
		}

		public class MultiSelectListPreference extends android.preference.DialogPreference {
		public deprecated class MultiSelectListPreference extends android.preference.DialogPreference {
		ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet, int);
		ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet);
		@@ -34718,7 +34718,7 @@ package android.preference {
		method public void setValues(java.util.Set<java.lang.String>);
		}

		public class Preference implements java.lang.Comparable {
		public deprecated class Preference implements java.lang.Comparable {
		ctor public Preference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public Preference(android.content.Context, android.util.AttributeSet, int);
		ctor public Preference(android.content.Context, android.util.AttributeSet);
		@@ -34815,21 +34815,21 @@ package android.preference {
		field public static final int DEFAULT_ORDER = 2147483647; // 0x7fffffff
		}

		public static class Preference.BaseSavedState extends android.view.AbsSavedState {
		public static deprecated class Preference.BaseSavedState extends android.view.AbsSavedState {
		ctor public Preference.BaseSavedState(android.os.Parcel);
		ctor public Preference.BaseSavedState(android.os.Parcelable);
		field public static final android.os.Parcelable.Creator<android.preference.Preference.BaseSavedState> CREATOR;
		}

		public static abstract interface Preference.OnPreferenceChangeListener {
		public static abstract deprecated interface Preference.OnPreferenceChangeListener {
		method public abstract boolean onPreferenceChange(android.preference.Preference, java.lang.Object);
		}

		public static abstract interface Preference.OnPreferenceClickListener {
		public static abstract deprecated interface Preference.OnPreferenceClickListener {
		method public abstract boolean onPreferenceClick(android.preference.Preference);
		}

		public abstract class PreferenceActivity extends android.app.ListActivity implements android.preference.PreferenceFragment.OnPreferenceStartFragmentCallback {
		public abstract deprecated class PreferenceActivity extends android.app.ListActivity implements android.preference.PreferenceFragment.OnPreferenceStartFragmentCallback {
		ctor public PreferenceActivity();
		method public deprecated void addPreferencesFromIntent(android.content.Intent);
		method public deprecated void addPreferencesFromResource(int);
		@@ -34869,7 +34869,7 @@ package android.preference {
		field public static final long HEADER_ID_UNDEFINED = -1L; // 0xffffffffffffffffL
		}

		public static final class PreferenceActivity.Header implements android.os.Parcelable {
		public static final deprecated class PreferenceActivity.Header implements android.os.Parcelable {
		ctor public PreferenceActivity.Header();
		method public int describeContents();
		method public java.lang.CharSequence getBreadCrumbShortTitle(android.content.res.Resources);
		@@ -34895,14 +34895,14 @@ package android.preference {
		field public int titleRes;
		}

		public class PreferenceCategory extends android.preference.PreferenceGroup {
		public deprecated class PreferenceCategory extends android.preference.PreferenceGroup {
		ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet, int, int);
		ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet, int);
		ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet);
		ctor public PreferenceCategory(android.content.Context);
		}

		public abstract interface PreferenceDataStore {
		public abstract deprecated interface PreferenceDataStore {
		method public default boolean getBoolean(java.lang.String, boolean);
		method public default float getFloat(java.lang.String, float);
		method public default int getInt(java.lang.String, int);
		@@ -34932,7 +34932,7 @@ package android.preference {
		method public abstract boolean onPreferenceStartFragment(android.preference.PreferenceFragment, android.preference.Preference);
		}

		public abstract class PreferenceGroup extends android.preference.Preference {
		public abstract deprecated class PreferenceGroup extends android.preference.Preference {
		ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet, int, int);
		ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet, int);
		ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet);
		@@ -34951,7 +34951,7 @@ package android.preference {
		method public void setOrderingAsAdded(boolean);
		}

		public class PreferenceManager {
		public deprecated class PreferenceManager {
		method public android.preference.PreferenceScreen createPreferenceScreen(android.content.Context);
		method public android.preference.Preference findPreference(java.lang.CharSequence);
		method public static android.content.SharedPreferences getDefaultSharedPreferences(android.content.Context);
		@@ -34973,19 +34973,19 @@ package android.preference {
		field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
		}

		public static abstract interface PreferenceManager.OnActivityDestroyListener {
		public static abstract deprecated interface PreferenceManager.OnActivityDestroyListener {
		method public abstract void onActivityDestroy();
		}

		public static abstract interface PreferenceManager.OnActivityResultListener {
		public static abstract deprecated interface PreferenceManager.OnActivityResultListener {
		method public abstract boolean onActivityResult(int, int, android.content.Intent);
		}

		public static abstract interface PreferenceManager.OnActivityStopListener {
		public static abstract deprecated interface PreferenceManager.OnActivityStopListener {
		method public abstract void onActivityStop();
		}

		public final class PreferenceScreen extends android.preference.PreferenceGroup implements android.widget.AdapterView.OnItemClickListener android.content.DialogInterface.OnDismissListener {
		public final deprecated class PreferenceScreen extends android.preference.PreferenceGroup implements android.widget.AdapterView.OnItemClickListener android.content.DialogInterface.OnDismissListener {
		method public void bind(android.widget.ListView);
		method public android.app.Dialog getDialog();
		method public android.widget.ListAdapter getRootAdapter();
		@@ -34994,7 +34994,7 @@ package android.preference {
		method public void onItemClick(android.widget.AdapterView, android.view.View, int, long);
		}

		public class RingtonePreference extends android.preference.Preference implements android.preference.PreferenceManager.OnActivityResultListener {
		public deprecated class RingtonePreference extends android.preference.Preference implements android.preference.PreferenceManager.OnActivityResultListener {
		ctor public RingtonePreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public RingtonePreference(android.content.Context, android.util.AttributeSet, int);
		ctor public RingtonePreference(android.content.Context, android.util.AttributeSet);
		@@ -35011,7 +35011,7 @@ package android.preference {
		method public void setShowSilent(boolean);
		}

		public class SwitchPreference extends android.preference.TwoStatePreference {
		public deprecated class SwitchPreference extends android.preference.TwoStatePreference {
		ctor public SwitchPreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public SwitchPreference(android.content.Context, android.util.AttributeSet, int);
		ctor public SwitchPreference(android.content.Context, android.util.AttributeSet);
		@@ -35024,7 +35024,7 @@ package android.preference {
		method public void setSwitchTextOn(int);
		}

		public abstract class TwoStatePreference extends android.preference.Preference {
		public abstract deprecated class TwoStatePreference extends android.preference.Preference {
		ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet, int, int);
		ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet, int);
		ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet);

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4357,7 +4357,7 @@ package android.permissionpresenterservice {

		package android.preference {

		public class PreferenceManager {
		public deprecated class PreferenceManager {
		method public boolean isStorageCredentialProtected();
		method public void setStorageCredentialProtected();
		}

core/java/android/preference/CheckBoxPreference.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,14 @@ import android.widget.Checkable;
		* @attr ref android.R.styleable#CheckBoxPreference_summaryOff
		* @attr ref android.R.styleable#CheckBoxPreference_summaryOn
		* @attr ref android.R.styleable#CheckBoxPreference_disableDependentsState
		*
		* @deprecated Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a>
		* <a href="{@docRoot}reference/androidx/preference/package-summary.html">
		* Preference Library</a> for consistent behavior across all devices. For more information on
		* using the AndroidX Preference Library see
		* <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a>.
		*/
		@Deprecated
		public class CheckBoxPreference extends TwoStatePreference {

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

core/java/android/preference/DialogPreference.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -50,7 +50,14 @@ import android.widget.TextView;
		* @attr ref android.R.styleable#DialogPreference_dialogLayout
		* @attr ref android.R.styleable#DialogPreference_positiveButtonText
		* @attr ref android.R.styleable#DialogPreference_negativeButtonText
		*
		* @deprecated Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a>
		* <a href="{@docRoot}reference/androidx/preference/package-summary.html">
		* Preference Library</a> for consistent behavior across all devices. For more information on
		* using the AndroidX Preference Library see
		* <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a>.
		*/
		@Deprecated
		public abstract class DialogPreference extends Preference implements
		DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
		PreferenceManager.OnActivityDestroyListener {

core/java/android/preference/EditTextPreference.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -42,7 +42,14 @@ import android.widget.EditText;
		* This preference will store a string into the SharedPreferences.
		* <p>
		* See {@link android.R.styleable#EditText EditText Attributes}.
		*
		* @deprecated Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a>
		* <a href="{@docRoot}reference/androidx/preference/package-summary.html">
		* Preference Library</a> for consistent behavior across all devices. For more information on
		* using the AndroidX Preference Library see
		* <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a>.
		*/
		@Deprecated
		public class EditTextPreference extends DialogPreference {
		/**
		* The edit text shown in the dialog.