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

Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 20:53:22 +00:00
committed by Android (Google) Code Review
parent 06426bf652 7c42e16eb0
commit 1eaab2db82
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/java/android/graphics/Bitmap.java
View File

@@ -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