summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2012-02-24 15:09:54 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-02-24 15:09:54 -0800
commit7b49b4bea8090bb8e5015225eb05686d3676205c (patch)
tree7cfe655be70ea8adc3f9aed9d567cd6da768ae6c /libs
parent6513daef5e34082d9670c4149252703d40f8d937 (diff)
parente9d4c71f47f74ee9a4a490f62769ad010a17d19b (diff)
Merge "deprecate L_8, LA_88 and RGB_332 in sdk"
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/PixelFormat.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ui/PixelFormat.cpp b/libs/ui/PixelFormat.cpp
index 6993dac6998a..fc1d3c29db11 100644
--- a/libs/ui/PixelFormat.cpp
+++ b/libs/ui/PixelFormat.cpp
@@ -48,7 +48,10 @@ static Info const sPixelFormatInfos[] = {
{ 4, 32, {32,24, 24,16, 16, 8, 8, 0 }, PixelFormatInfo::RGBA },
{ 2, 16, { 1, 0, 16,11, 11, 6, 6, 1 }, PixelFormatInfo::RGBA },
{ 2, 16, { 4, 0, 16,12, 12, 8, 8, 4 }, PixelFormatInfo::RGBA },
- { 1, 8, { 8, 0, 0, 0, 0, 0, 0, 0 }, PixelFormatInfo::ALPHA}
+ { 1, 8, { 8, 0, 0, 0, 0, 0, 0, 0 }, PixelFormatInfo::ALPHA},
+ { 1, 8, { 0, 0, 8, 0, 8, 0, 8, 0 }, PixelFormatInfo::L },
+ { 2, 16, {16, 8, 8, 0, 8, 0, 8, 0 }, PixelFormatInfo::LA },
+ { 1, 8, { 0, 0, 8, 5, 5, 2, 2, 0 }, PixelFormatInfo::RGB },
};
static const Info* gGetPixelFormatTable(size_t* numEntries) {