cherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8 (36193d09) · Commits · e / os / android_frameworks_base

core/java/android/app/ActionBar.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,16 @@ import android.view.Window;
		import android.widget.SpinnerAdapter;

		/**
		* This is the public interface to the contextual ActionBar.
		* The ActionBar acts as a replacement for the title bar in Activities.
		* It provides facilities for creating toolbar actions as well as
		* methods of navigating around an application.
		* Acts as a replacement for the title bar in Activities.
		* The action bar provides facilities for creating toolbar actions as well as
		* methods of navigating the application.
		* <p>By default, the action bar appears at the top of every activity, with the application icon on
		* the left, followed by the activity title. Items from the activity's options menu are also
		* accessible from the action bar.</p>
		* <p>From your activity, you can retrieve an instance of {@link ActionBar} by calling {@link
		* android.app.Activity#getActionBar getActionBar()}.</p>
		* <p>For more information, read the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action
		* Bar</a> developer guide.</p>
		*/
		public abstract class ActionBar {
		/**

+3 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,9 @@ 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>

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ import java.io.PrintWriter;
		*
		* <p>Most implementations should not derive directly from this class, but
		* instead inherit from {@link AsyncTaskLoader}.</p>
		* <p>For more information, see the <a
		* href="{@docRoot}guide/topics/fundamentals/loaders.html">Loaders</a> developer guide.</p>
		*
		* @param <D> The result returned when the load is complete
		*/