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

Commit aa91b0d1 authored Dec 20, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Dec 20, 2017

Merge "Improve Fragment+Loader deprecation Javadoc"

parents 7467d044 1f4e67b6

core/java/android/app/DialogFragment.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -137,7 +137,9 @@ import java.io.PrintWriter;
	* {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialogOrActivity.java		* {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentDialogOrActivity.java
	* embed}		* embed}
	*		*
	* @deprecated Use {@link android.support.v4.app.DialogFragment}		* @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>
			* {@link android.support.v4.app.DialogFragment} for consistent behavior across all devices
			* and access to <a href="{@docRoot}topic/libraries/architecture/lifecycle.html">Lifecycle</a>.
	*/		*/
	@Deprecated		@Deprecated
	public class DialogFragment extends Fragment		public class DialogFragment extends Fragment

core/java/android/app/Fragment.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,9 @@ import java.lang.reflect.InvocationTargetException;
	* pressing back will pop it to return the user to whatever previous state		* pressing back will pop it to return the user to whatever previous state
	* the activity UI was in.		* the activity UI was in.
	*		*
	* @deprecated Use {@link android.support.v4.app.Fragment}		* @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>
			* {@link android.support.v4.app.Fragment} for consistent behavior across all devices
			* and access to <a href="{@docRoot}topic/libraries/architecture/lifecycle.html">Lifecycle</a>.
	*/		*/
	@Deprecated		@Deprecated
	public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListener {		public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListener {

core/java/android/app/FragmentContainer.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,8 @@ import android.view.View;
	/**		/**
	* Callbacks to a {@link Fragment}'s container.		* Callbacks to a {@link Fragment}'s container.
	*		*
	* @deprecated Use {@link android.support.v4.app.FragmentContainer}		* @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>
			* {@link android.support.v4.app.FragmentContainer}.
	*/		*/
	@Deprecated		@Deprecated
	public abstract class FragmentContainer {		public abstract class FragmentContainer {

core/java/android/app/FragmentController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,8 @@ import java.util.List;
	* It is the responsibility of the host to take care of the Fragment's lifecycle.		* It is the responsibility of the host to take care of the Fragment's lifecycle.
	* The methods provided by {@link FragmentController} are for that purpose.		* The methods provided by {@link FragmentController} are for that purpose.
	*		*
	* @deprecated Use {@link android.support.v4.app.FragmentController}		* @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>
			* {@link android.support.v4.app.FragmentController}
	*/		*/
	@Deprecated		@Deprecated
	public class FragmentController {		public class FragmentController {

core/java/android/app/FragmentHostCallback.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,8 @@ import java.io.PrintWriter;
	* host fragments, implement {@link FragmentHostCallback}, overriding the methods		* host fragments, implement {@link FragmentHostCallback}, overriding the methods
	* applicable to the host.		* applicable to the host.
	*		*
	* @deprecated Use {@link android.support.v4.app.FragmentHostCallback}		* @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>
			* {@link android.support.v4.app.FragmentHostCallback}
	*/		*/
	@Deprecated		@Deprecated
	public abstract class FragmentHostCallback<E> extends FragmentContainer {		public abstract class FragmentHostCallback<E> extends FragmentContainer {