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

Commit e4fa629d authored Sep 14, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Sep 14, 2018

Merge "Update javadoc to deprecate non-compat version widgets"

parents ce77caf6 2cda2832

packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;

packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;

packages/SettingsLib/src/com/android/settingslib/net/ChartDataLoader.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -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";

packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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";

packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -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>> {