summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquddusc <quddusc@google.com>2017-02-09 21:26:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-09 21:26:20 +0000
commit270fff6a7c6c80ad24c20be9fbf152fcfdf61758 (patch)
tree312a18abf54506159fbb1c30d8e16d893ecf9af6
parent6560727f3702b04c1c78a019d94600dbc0054da2 (diff)
parent4a1a45ba6cfc2eb13fb422197ddfc2c27695d760 (diff)
downloadnative-270fff6a7c6c80ad24c20be9fbf152fcfdf61758.tar.gz
Merge "NDK docs: Fixed in-line comments for A8 and ARGB444 bitmap configurations. Test: Verified changes with romainguy@. Related bugs: b/26922523"
-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,
};