diff options
author | Newton Allen <newt@google.com> | 2013-11-01 02:37:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-01 02:37:22 +0000 |
commit | 52e3393afd1f6b6351357d6a45df7097ba3579f8 (patch) | |
tree | 40c2ad0d0b6615defde4f1be02a33b5cae178743 /graphics/java/android | |
parent | e11b6b036bb66a72ba2386641811dbd09fe7e5e5 (diff) | |
parent | c502744f2ddcc80a34f5197b5d2c0d701c7d6e71 (diff) | |
download | frameworks_base-52e3393afd1f6b6351357d6a45df7097ba3579f8.zip frameworks_base-52e3393afd1f6b6351357d6a45df7097ba3579f8.tar.gz frameworks_base-52e3393afd1f6b6351357d6a45df7097ba3579f8.tar.bz2 |
Merge "Fix some documentation typos."
Diffstat (limited to 'graphics/java/android')
-rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 2 | ||||
-rw-r--r-- | graphics/java/android/graphics/BitmapFactory.java | 4 | ||||
-rw-r--r-- | graphics/java/android/graphics/drawable/Drawable.java | 4 |
3 files changed, 5 insertions, 5 deletions
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 @@ public final class Bitmap implements Parcelable { } /** - * 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 0f61bcb..b73db74 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -462,7 +462,7 @@ public class BitmapFactory { * * @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); @@ -510,7 +510,7 @@ public class BitmapFactory { * @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 94630e9..c84cdb0 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -694,8 +694,8 @@ public abstract class Drawable { */ 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) {} |