Merge "docs: add developer guide cross-references, Project ACRE" (cac15eb2) · Commits · e / os / android_frameworks_base

core/java/android/app/ActionBar.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -43,15 +43,18 @@ import android.widget.SpinnerAdapter;
		* modify various characteristics of the action bar or remove it completely.</p>
		* <p>From your activity, you can retrieve an instance of {@link ActionBar} by calling {@link
		* android.app.Activity#getActionBar getActionBar()}.</p>
		* <p>For information about how to use the action bar, including how to add action items, navigation
		* modes and more, read the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action
		* Bar</a> developer guide.</p>
		* <p>In some cases, the action bar may be overlayed by another bar that enables contextual actions,
		* using an {@link android.view.ActionMode}. For example, when the user selects one or more items in
		* your activity, you can enable an action mode that offers actions specific to the selected
		* items, with a UI that temporarily replaces the action bar. Although the UI may occupy the
		* same space, the {@link android.view.ActionMode} APIs are distinct and independent from those for
		* {@link ActionBar}.
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For information about how to use the action bar, including how to add action items, navigation
		* modes and more, read the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action
		* Bar</a> developer guide.</p>
		* </div>
		*/
		public abstract class ActionBar {
		/**

core/java/android/app/Activity.java

+16 −13

Original line number	Diff line number	Diff line
		@@ -111,18 +111,6 @@ import java.util.HashMap;
		* {@link android.R.styleable#AndroidManifestActivity <activity>}
		* declaration in their package's <code>AndroidManifest.xml</code>.</p>
		*
		* <p>The Activity class is an important part of an application's overall lifecycle,
		* and the way activities are launched and put together is a fundamental
		* 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>
		* documents.</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>
		* document.</p>
		*
		* <p>Topics covered here:
		* <ol>
		* <li><a href="#Fragments">Fragments</a>
		@@ -134,6 +122,21 @@ import java.util.HashMap;
		* <li><a href="#ProcessLifecycle">Process Lifecycle</a>
		* </ol>
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>The Activity class is an important part of an application's overall lifecycle,
		* and the way activities are launched and put together is a fundamental
		* 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>
		* 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>
		* developer guide.</p>
		* </div>
		*
		* <a name="Fragments"></a>
		* <h3>Fragments</h3>
		*

core/java/android/app/Fragment.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -162,9 +162,6 @@ final class FragmentState implements Parcelable {
		* constructor to instantiate it. If the empty constructor is not available,
		* a runtime exception will occur in some cases during state restore.
		*
		* <p>For more documentation, also see the <a
		* href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p>
		*
		* <p>Topics covered here:
		* <ol>
		* <li><a href="#OlderPlatforms">Older Platforms</a>
		@@ -173,6 +170,12 @@ final class FragmentState implements Parcelable {
		* <li><a href="#BackStack">Back Stack</a>
		* </ol>
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using fragments, read the
		* <a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p>
		* </div>
		*
		* <a name="OlderPlatforms"></a>
		* <h3>Older Platforms</h3>
		*

core/java/android/app/FragmentManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,12 @@ import java.util.Arrays;
		/**
		* Interface for interacting with {@link Fragment} objects inside of an
		* {@link Activity}
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using fragments, read the
		* <a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p>
		* </div>
		*/
		public abstract class FragmentManager {
		/**

core/java/android/app/FragmentTransaction.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,12 @@ package android.app;

		/**
		* API for performing a set of Fragment operations.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using fragments, read the
		* <a href="{@docRoot}guide/topics/fundamentals/fragments.html">Fragments</a> developer guide.</p>
		* </div>
		*/
		public abstract class FragmentTransaction {
		/**