summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2017-04-13 20:48:29 -0700
committer Romain Guy <romainguy@google.com> 2017-04-13 20:48:29 -0700
commit7c42e16eb076b04850b7fa083d31735774bd42dd (patch)
tree3f9cb2378a05d30ce32e921a08297fa84a5be91e
parent4db137b0599a9dfff8a26cb5c2b6dab71b457a9b (diff)
Clarify doc for Bitmap.createBitmap()
Bug: 37323693 Test: compiles Change-Id: I8cf316cf4c67b69c47c67848c576af6399a0111f
-rw-r--r--graphics/java/android/graphics/Bitmap.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 919068500e6f..7a8e4873a7c9 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -916,9 +916,8 @@ public final class Bitmap implements Parcelable {
* @param hasAlpha If the bitmap is ARGB_8888 or RGBA_16F this flag can be used to
* mark the bitmap as opaque. Doing so will clear the bitmap in black
* instead of transparent.
- * @param colorSpace The color space of the bitmap. If null,
- * {@link ColorSpace.Named#SRGB sRGB} is assumed. This argument is
- * ignored if the config is not {@link Config#ARGB_8888}.
+ * @param colorSpace The color space of the bitmap. If null or if the config is not
+ * {@link Config#ARGB_8888}, {@link ColorSpace.Named#SRGB sRGB} is assumed.
*
* @throws IllegalArgumentException if the width or height are <= 0, if
* Config is Config.HARDWARE (because hardware bitmaps are always
@@ -968,9 +967,8 @@ public final class Bitmap implements Parcelable {
* @param hasAlpha If the bitmap is ARGB_8888 or RGBA_16F this flag can be used to
* mark the bitmap as opaque. Doing so will clear the bitmap in black
* instead of transparent.
- * @param colorSpace The color space of the bitmap. If null,
- * {@link ColorSpace.Named#SRGB sRGB} is assumed. This argument is
- * ignored if the config is not {@link Config#ARGB_8888}.
+ * @param colorSpace The color space of the bitmap. If null or if the config is not
+ * {@link Config#ARGB_8888}, {@link ColorSpace.Named#SRGB sRGB} is assumed.
*
* @throws IllegalArgumentException if the width or height are <= 0, if
* Config is Config.HARDWARE (because hardware bitmaps are always