Merge "docs: fix broken links in Activity reference" into nyc-dev (d428a012) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -175,11 +175,11 @@ import java.util.List;
		* part of the platform's application model. For a detailed perspective on the structure of an
		* Android application and how activities behave, please read the
		* <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a> and
		* <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>
		* <a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tasks and Back Stack</a>
		* developer guides.</p>
		*
		* <p>You can also find a detailed discussion about how to create activities in the
		* <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a>
		* <a href="{@docRoot}guide/components/activities.html">Activities</a>
		* developer guide.</p>
		* </div>
		*
		@@ -3366,7 +3366,7 @@ public class Activity extends ContextThemeWrapper
		* should override the method {@link #onPrepareNavigateUpTaskStack(TaskStackBuilder)}
		* to supply those arguments.</p>
		*
		* <p>See <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>
		* <p>See <a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tasks and Back Stack</a>
		* from the developer guide and <a href="{@docRoot}design/patterns/navigation.html">Navigation</a>
		* from the design guide for more information about navigating within your app.</p>
		*
		@@ -4467,7 +4467,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @throws android.content.ActivityNotFoundException
		*
		* @see {@link #startActivity(Intent, Bundle)}
		* @see #startActivity(Intent, Bundle)
		* @see #startActivityForResult
		*/
		@Override
		@@ -4494,7 +4494,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @throws android.content.ActivityNotFoundException
		*
		* @see {@link #startActivity(Intent)}
		* @see #startActivity(Intent)
		* @see #startActivityForResult
		*/
		@Override
		@@ -4516,7 +4516,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @throws android.content.ActivityNotFoundException
		*
		* @see {@link #startActivities(Intent[], Bundle)}
		* @see #startActivities(Intent[], Bundle)
		* @see #startActivityForResult
		*/
		@Override
		@@ -4543,7 +4543,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @throws android.content.ActivityNotFoundException
		*
		* @see {@link #startActivities(Intent[])}
		* @see #startActivities(Intent[])
		* @see #startActivityForResult
		*/
		@Override
		@@ -4923,7 +4923,7 @@ public class Activity extends ContextThemeWrapper
		* <p>As of {@link android.os.Build.VERSION_CODES#JELLY_BEAN} an alternative
		* to using this with starting activities is to supply the desired animation
		* information through a {@link ActivityOptions} bundle to
		* {@link #startActivity(Intent, Bundle) or a related function. This allows
		* {@link #startActivity(Intent, Bundle)} or a related function. This allows
		* you to specify a custom animation even when starting an activity from
		* outside the context of the current top activity.
		*
		@@ -6105,7 +6105,6 @@ public class Activity extends ContextThemeWrapper
		* the return value must be checked.
		*
		* @see #onVisibleBehindCanceled()
		* @see #onBackgroundVisibleBehindChanged(boolean)
		*/
		public boolean requestVisibleBehind(boolean visible) {
		if (!mResumed) {
		@@ -6133,7 +6132,6 @@ public class Activity extends ContextThemeWrapper
		* process. Otherwise {@link #onStop()} will be called following return.
		*
		* @see #requestVisibleBehind(boolean)
		* @see #onBackgroundVisibleBehindChanged(boolean)
		*/
		@CallSuper
		public void onVisibleBehindCanceled() {