diff options
8 files changed, 41 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java index 3bade25b712a..192a40c5e79a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java @@ -26,6 +26,12 @@ import android.view.View; import androidx.preference.DialogPreference; import androidx.preference.PreferenceDialogFragment; +/** + * Framework version is deprecated, use the compat version instead. + * + * @deprecated + */ +@Deprecated public class CustomDialogPreference extends DialogPreference { private CustomPreferenceDialogFragment mFragment; diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java index dfaff6108c89..3caa0bb9cf4b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java @@ -31,6 +31,12 @@ import androidx.annotation.CallSuper; import androidx.preference.EditTextPreference; import androidx.preference.EditTextPreferenceDialogFragment; +/** + * Framework version is deprecated, use the compat version instead. + * + * @deprecated + */ +@Deprecated public class CustomEditTextPreference extends EditTextPreference { private CustomPreferenceDialogFragment mFragment; diff --git a/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoader.java b/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoader.java index 223c05546b7f..60d22a0d5803 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoader.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoader.java @@ -34,8 +34,11 @@ import android.os.RemoteException; import com.android.settingslib.AppItem; /** - * Loader for historical chart data for both network and UID details. + * Framework loader is deprecated, use the compat version instead. + * + * @deprecated */ +@Deprecated public class ChartDataLoader extends AsyncTaskLoader<ChartData> { private static final String KEY_TEMPLATE = "template"; private static final String KEY_APP = "app"; diff --git a/packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java b/packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java index 572bae1112da..649aeffd0d5f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java @@ -24,6 +24,12 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; +/** + * Framework loader is deprecated, use the compat version instead. + * + * @deprecated + */ +@Deprecated public class SummaryForAllUidLoader extends AsyncTaskLoader<NetworkStats> { private static final String KEY_TEMPLATE = "template"; private static final String KEY_START = "start"; diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java index 6597daa9acaf..b0e987ee2779 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java @@ -32,8 +32,11 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.List; /** - * Manages IPC communication to SettingsIntelligence for suggestion related services. + * Framework mixin is deprecated, use the compat version instead. + * + * @deprecated */ +@Deprecated public class SuggestionControllerMixin implements SuggestionController.ServiceConnectionListener, androidx.lifecycle.LifecycleObserver, LoaderManager.LoaderCallbacks<List<Suggestion>> { @@ -65,7 +68,7 @@ public class SuggestionControllerMixin implements SuggestionController.ServiceCo mContext = context.getApplicationContext(); mHost = host; mSuggestionController = new SuggestionController(mContext, componentName, - this /* serviceConnectionListener */); + this /* serviceConnectionListener */); if (lifecycle != null) { lifecycle.addObserver(this); } diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionLoader.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionLoader.java index 9c1af1edc778..8011424bb0d2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionLoader.java +++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionLoader.java @@ -24,6 +24,12 @@ import com.android.settingslib.utils.AsyncLoader; import java.util.List; +/** + * Framework loader is deprecated, use the compat version instead. + * + * @deprecated + */ +@Deprecated public class SuggestionLoader extends AsyncLoader<List<Suggestion>> { public static final int LOADER_ID_SUGGESTIONS = 42; diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java b/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java index 06770ac09558..64b9ffe7a735 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java @@ -29,7 +29,9 @@ import android.content.Context; * This loader is based on the MailAsyncTaskLoader from the AOSP EmailUnified repo. * * @param <T> the data type to be loaded. + * @deprecated Framework loader is deprecated, use the compat version instead. */ +@Deprecated public abstract class AsyncLoader<T> extends AsyncTaskLoader<T> { private T mResult; diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java index 2987c1597193..fcf236337703 100644 --- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java @@ -25,6 +25,12 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.SetPreferenceScreen; +/** + * Framework mixin is deprecated, use the compat version instead. + * + * @deprecated + */ +@Deprecated public class FooterPreferenceMixin implements LifecycleObserver, SetPreferenceScreen { private final PreferenceFragment mFragment; |