diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-01-17 15:45:10 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2014-02-24 15:44:31 -0500 |
| commit | b644a3b84521e2155a5af985a4d4ed305474e567 (patch) | |
| tree | 36e4f13d3d0ba5217cab9693c1844ffcfe8c240f /graphics/java | |
| parent | 875e2101d71afe7e4acf10b061c942fbf7294775 (diff) | |
| download | frameworks_base-b644a3b84521e2155a5af985a4d4ed305474e567.zip frameworks_base-b644a3b84521e2155a5af985a4d4ed305474e567.tar.gz frameworks_base-b644a3b84521e2155a5af985a4d4ed305474e567.tar.bz2 | |
Updates to the Skia API needed to merge the WebView m33 version of Skia.
This is a cherry-pick of 2 CLs:
21969a2b26945da3fd86aef7c93479e4fb359a65
c7a581cf7691db5c61e6694aa51daaa994004bd9
Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index d6b73fd..7676143 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -400,7 +400,7 @@ public final class Bitmap implements Parcelable { * No color information is stored. * With this configuration, each pixel requires 1 byte of memory. */ - ALPHA_8 (2), + ALPHA_8 (1), /** * Each pixel is stored on 2 bytes and only the RGB channels are @@ -416,7 +416,7 @@ public final class Bitmap implements Parcelable { * This configuration may be useful when using opaque bitmaps * that do not require high color fidelity. */ - RGB_565 (4), + RGB_565 (3), /** * Each pixel is stored on 2 bytes. The three RGB color channels @@ -438,7 +438,7 @@ public final class Bitmap implements Parcelable { * it is advised to use {@link #ARGB_8888} instead. */ @Deprecated - ARGB_4444 (5), + ARGB_4444 (4), /** * Each pixel is stored on 4 bytes. Each channel (RGB and alpha @@ -448,13 +448,13 @@ public final class Bitmap implements Parcelable { * This configuration is very flexible and offers the best * quality. It should be used whenever possible. */ - ARGB_8888 (6); + ARGB_8888 (5); final int nativeInt; @SuppressWarnings({"deprecation"}) private static Config sConfigs[] = { - null, null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888 + null, ALPHA_8, null, RGB_565, ARGB_4444, ARGB_8888 }; Config(int ni) { |