summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author quddusc <quddusc@google.com> 2017-02-09 21:38:47 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-09 21:38:47 +0000
commitcc070b4ddda802f6586fde69abd6ab2ec93e9e37 (patch)
treeeef1c0090fe036eb904c9c44fa2423a64193dcf9
parentd7a4a56b37915de79659345c77949993814259a4 (diff)
parent3d2dbf4d2f6677ac5199f02a5354a20d89afce55 (diff)
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/26922523" am: 270fff6a7c am: f9c7e2a002
am: 3d2dbf4d2f Change-Id: Ice33e4e60d90f303652d2a993e90e3c58f3e261f
-rw-r--r--include/android/bitmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/android/bitmap.h b/include/android/bitmap.h
index 261e64fac9..2def64dc90 100644
--- a/include/android/bitmap.h
+++ b/include/android/bitmap.h
@@ -56,9 +56,9 @@ enum AndroidBitmapFormat {
ANDROID_BITMAP_FORMAT_RGBA_8888 = 1,
/** Red: 5 bits, Green: 6 bits, Blue: 5 bits. **/
ANDROID_BITMAP_FORMAT_RGB_565 = 4,
- /** Red: 4 bits, Green: 4 bits, Blue: 4 bits, Alpha: 4 bits. **/
+ /** Deprecated in API level 13. Because of the poor quality of this configuration, it is advised to use ARGB_8888 instead. **/
ANDROID_BITMAP_FORMAT_RGBA_4444 = 7,
- /** Deprecated. */
+ /** Alpha: 8 bits. */
ANDROID_BITMAP_FORMAT_A_8 = 8,
};