diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-21 17:37:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 17:37:54 +0000 |
| commit | 449e46600f75a21975ceb1c991f768f833ed7fbf (patch) | |
| tree | bbd5014775b7181cad3979df0a9322beff02a89f /core | |
| parent | c53bd971ba4dd5dcbd84857052baa4aa9d55d41a (diff) | |
| parent | 0047d3e025b43fd2dc05734f7ea6229291445046 (diff) | |
| download | frameworks_base-449e46600f75a21975ceb1c991f768f833ed7fbf.zip frameworks_base-449e46600f75a21975ceb1c991f768f833ed7fbf.tar.gz frameworks_base-449e46600f75a21975ceb1c991f768f833ed7fbf.tar.bz2 | |
am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '0047d3e025b43fd2dc05734f7ea6229291445046':
Miscellaneous small documentation fixes.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/Loader.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/AdapterView.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a8716bf..4f0683c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -824,7 +824,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) { diff --git a/core/java/android/content/Loader.java b/core/java/android/content/Loader.java index f3828b0..e9d82af 100644 --- a/core/java/android/content/Loader.java +++ b/core/java/android/content/Loader.java @@ -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. * diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index af62d9c..9475754 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12468,7 +12468,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> * diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index 962ffba..1da22ca 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -667,7 +667,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. |