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

Commit 8d41e653 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Miscellaneous small documentation fixes."

parents 4a642ee5 9525f2a7

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ public class Activity extends ContextThemeWrapper 
    }



    /**

     * Return the LoaderManager for this fragment, creating it if needed.

     * Return the LoaderManager for this activity, creating it if needed.

     */

    public LoaderManager getLoaderManager() {

        if (mLoaderManager != null) {

core/java/android/content/Loader.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;



/**

 * An abstract class that performs asynchronous loading of data. While Loaders are active

 * A class that performs asynchronous loading of data. While Loaders are active

 * they should monitor the source of their data and deliver new results when the contents

 * change.  See {@link android.app.LoaderManager} for more detail.

 *

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -11838,7 +11838,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    }















    /**













     * <p>Compute the vertical extent of the horizontal scrollbar's thumb













     * <p>Compute the vertical extent of the vertical scrollbar's thumb















     * within the vertical range. This value is used to compute the length















     * of the thumb within the scrollbar's track.</p>















     *

































core/java/android/widget/AdapterView.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -663,7 +663,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {





























    /**















     * When the current adapter is empty, the AdapterView can display a special view













     * call the empty view. The empty view is used to provide feedback to the user













     * called the empty view. The empty view is used to provide feedback to the user















     * that no data is available in this AdapterView.















     *















     * @return The view to show if the adapter is empty.

































docs/html/guide/topics/manifest/activity-element.jd



+1
−1




























Original line number
Diff line number
Diff line








@@ -580,7 +580,7 @@ This attribute was introduced in API Level 3.













  <a href="#nm"><code>android:name</code></a> attribute.































<p>The system reads this attribute to determine which activity should be started when













  the use presses the Up button in the action bar. The system can also use this information to













  the user presses the Up button in the action bar. The system can also use this information to















  synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p>































<p>To support API levels 4 - 16, you can also declare the parent activity with a {@code