Merge "Fix some documentation typos." into klp-docs
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index a307a73..028fa68 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -1213,8 +1213,8 @@
}
/**
- * Perform calling of an activity's {@link Activity#onPause} method. The
- * default implementation simply calls through to that method.
+ * Perform calling of an activity's {@link Activity#onSaveInstanceState}
+ * method. The default implementation simply calls through to that method.
*
* @param activity The activity being saved.
* @param outState The bundle to pass to the call.
diff --git a/core/java/android/view/Gravity.java b/core/java/android/view/Gravity.java
index 9a89fa5..324a1ae 100644
--- a/core/java/android/view/Gravity.java
+++ b/core/java/android/view/Gravity.java
@@ -123,7 +123,7 @@
public static final int RELATIVE_HORIZONTAL_GRAVITY_MASK = START | END;
/**
- * Apply a gravity constant to an object. This suppose that the layout direction is LTR.
+ * Apply a gravity constant to an object. This supposes that the layout direction is LTR.
*
* @param gravity The desired placement of the object, as defined by the
* constants in this class.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e2d98ed..6c04c0b 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9044,9 +9044,9 @@
*/
public interface OnLayoutChangeListener {
/**
- * Called when the focus state of a view has changed.
+ * Called when the layout bounds of a view changes due to layout processing.
*
- * @param v The view whose state has changed.
+ * @param v The view whose bounds have changed.
* @param left The new value of the view's left property.
* @param top The new value of the view's top property.
* @param right The new value of the view's right property.
@@ -10287,7 +10287,7 @@
}
/**
- * The horizontal location of this view relative to its {@link #getTop() top} position.
+ * The vertical location of this view relative to its {@link #getTop() top} position.
* This position is post-layout, in addition to wherever the object's
* layout placed it.
*
diff --git a/core/java/android/widget/BaseAdapter.java b/core/java/android/widget/BaseAdapter.java
index 401fcb8..c960342 100644
--- a/core/java/android/widget/BaseAdapter.java
+++ b/core/java/android/widget/BaseAdapter.java
@@ -24,8 +24,8 @@
/**
* Common base class of common implementation for an {@link Adapter} that can be
* used in both {@link ListView} (by implementing the specialized
- * {@link ListAdapter} interface} and {@link Spinner} (by implementing the
- * specialized {@link SpinnerAdapter} interface.
+ * {@link ListAdapter} interface) and {@link Spinner} (by implementing the
+ * specialized {@link SpinnerAdapter} interface).
*/
public abstract class BaseAdapter implements ListAdapter, SpinnerAdapter {
private final DataSetObservable mDataSetObservable = new DataSetObservable();
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 4c7395c..6d60dd2 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -995,7 +995,7 @@
}
/**
- * Returns true if the bitmap is marked as mutable (i.e. can be drawn into)
+ * Returns true if the bitmap is marked as mutable (i.e. can be drawn into)
*/
public final boolean isMutable() {
return mIsMutable;
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index a7c5b20..6fd1763 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -457,7 +457,7 @@
*
* @param res The resources object containing the image data
* @param id The resource id of the image data
- * @return The decoded bitmap, or null if the image could not be decode.
+ * @return The decoded bitmap, or null if the image could not be decoded.
*/
public static Bitmap decodeResource(Resources res, int id) {
return decodeResource(res, id, null);
@@ -505,7 +505,7 @@
* @param offset offset into imageData for where the decoder should begin
* parsing.
* @param length the number of bytes, beginning at offset, to parse
- * @return The decoded bitmap, or null if the image could not be decode.
+ * @return The decoded bitmap, or null if the image could not be decoded.
*/
public static Bitmap decodeByteArray(byte[] data, int offset, int length) {
return decodeByteArray(data, offset, length, null);
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 8a3d940..93738b0 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -693,8 +693,8 @@
*/
protected boolean onLevelChange(int level) { return false; }
/**
- * Override this in your subclass to change appearance if you recognize the
- * specified state.
+ * Override this in your subclass to change appearance if you vary based on
+ * the bounds.
*/
protected void onBoundsChange(Rect bounds) {}