Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Miscellaneous small documentation fixes."

Browse Source
This commit is contained in:
Elliott Hughes
2014-02-21 17:19:21 +00:00
committed by Gerrit Code Review
parent 4a642ee5e6 9525f2a72e
commit 8d41e653ba
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@@ -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() { public LoaderManager getLoaderManager() {
if (mLoaderManager != null) { if (mLoaderManager != null) {

2
core/java/android/content/Loader.java
View File

@@ -24,7 +24,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter; 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 * they should monitor the source of their data and deliver new results when the contents
* change. See {@link android.app.LoaderManager} for more detail. * change. See {@link android.app.LoaderManager} for more detail.
* *

2
core/java/android/view/View.java
View File

@@ -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 * within the vertical range. This value is used to compute the length
* of the thumb within the scrollbar's track.</p> * of the thumb within the scrollbar's track.</p>
* *

2
core/java/android/widget/AdapterView.java
View File

@@ -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 * 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. * that no data is available in this AdapterView.
* *
* @return The view to show if the adapter is empty. * @return The view to show if the adapter is empty.

2
docs/html/guide/topics/manifest/activity-element.jd
View File

@@ -580,7 +580,7 @@ This attribute was introduced in API Level 3.
<a href="#nm"><code>android:name</code></a> attribute. <a href="#nm"><code>android:name</code></a> attribute.
<p>The system reads this attribute to determine which activity should be started when <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> 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 <p>To support API levels 4 - 16, you can also declare the parent activity with a {@code

2
docs/html/tools/testing/testing_ui.jd
View File

@@ -90,7 +90,7 @@ Functional or black-box UI testing does not require testers to know the internal
alt="User interface of uiautomatorviewer tool" height="327px" id="figure1"/> alt="User interface of uiautomatorviewer tool" height="327px" id="figure1"/>
</a> </a>
<p class="img-caption"> <p class="img-caption">
<strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test deviice. <strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test device.
</p> </p>
<p>To analyze the UI components of the application that you want to test:</p> <p>To analyze the UI components of the application that you want to test:</p>