Merge "Small documentation fixes across many files." (ab94a167) · Commits · e / os / android_frameworks_base

core/java/android/app/Fragment.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -212,8 +212,8 @@ final class FragmentState implements Parcelable {
		* state of its view hierarchy has been restored.
		* <li> {@link #onStart} makes the fragment visible to the user (based on its
		* containing activity being started).
		* <li> {@link #onResume} makes the fragment interacting with the user (based on its
		* containing activity being resumed).
		* <li> {@link #onResume} makes the fragment begin interacting with the user
		* (based on its containing activity being resumed).
		* </ol>
		*
		* <p>As a fragment is no longer being used, it goes through a reverse
		@@ -543,7 +543,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		* and later retrieved by the Fragment with {@link #getArguments}.
		*
		* <p>Applications should generally not implement a constructor. The
		* first place application code an run where the fragment is ready to
		* first place application code can run where the fragment is ready to
		* be used is in {@link #onAttach(Activity)}, the point where the fragment
		* is actually associated with its activity. Some applications may also
		* want to implement {@link #onInflate} to retrieve attributes from a
		@@ -699,8 +699,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		}

		/**
		* Return the arguments supplied when the fragment was instantiated,
		* if any.
		* Return the arguments supplied to {@link #setArguments}, if any.
		*/
		final public Bundle getArguments() {
		return mArguments;

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public abstract class FragmentManager {
		* with {@link FragmentTransaction#addToBackStack(String)
		* FragmentTransaction.addToBackStack()}. Entries can later be
		* retrieved with {@link FragmentManager#getBackStackEntryAt(int)
		* FragmentManager.getBackStackEntry()}.
		* FragmentManager.getBackStackEntryAt()}.
		*
		* <p>Note that you should never hold on to a BackStackEntry object;
		* the identifier as returned by {@link #getId} is the only thing that
		@@ -257,7 +257,7 @@ public abstract class FragmentManager {

		/**
		* Return the BackStackEntry at index <var>index</var> in the back stack;
		* entries start index 0 being the bottom of the stack.
		* where the item on the bottom of the stack has index 0.
		*/
		public abstract BackStackEntry getBackStackEntryAt(int index);

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ public abstract class FragmentTransaction {
		/**
		* Add a fragment to the activity state. This fragment may optionally
		* also have its view (if {@link Fragment#onCreateView Fragment.onCreateView}
		* returns non-null) into a container view of the activity.
		* returns non-null) inserted into a container view of the activity.
		*
		* @param containerViewId Optional identifier of the container this fragment is
		* to be placed in. If 0, it will not be placed in a container.

+2 −1

Original line number	Diff line number	Diff line
		@@ -477,7 +477,8 @@ public class Build {
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		* <li> The default result of {android.preference.PreferenceActivity#isValidFragment
		* <li> The default result of
		* {@link android.preference.PreferenceActivity#isValidFragment(String)
		* PreferenceActivity.isValueFragment} becomes false instead of true.</li>
		* <li> In {@link android.webkit.WebView}, apps targeting earlier versions will have
		* JS URLs evaluated directly and any result of the evaluation will not replace

+1 −1

Original line number	Diff line number	Diff line
		@@ -291,7 +291,7 @@ public abstract class DocumentsProvider extends ContentProvider {
		}

		/**
		* Return documents that that match the given query under the requested
		* Return documents that match the given query under the requested
		* root. The returned documents should be sorted by relevance in descending
		* order. How documents are matched against the query string is an
		* implementation detail left to each provider, but it's suggested that at