diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-31 22:05:58 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-01-31 22:05:58 -0800 |
| commit | f6a362a5f65c1470399d869f0c39caac40e561a3 (patch) | |
| tree | bf0d71939c8949af52765d8b6fc58024cf2989ca /graphics/java | |
| parent | 076d059b54664b31920f0be13d56c657ab77cecc (diff) | |
| download | frameworks_base-f6a362a5f65c1470399d869f0c39caac40e561a3.zip frameworks_base-f6a362a5f65c1470399d869f0c39caac40e561a3.tar.gz frameworks_base-f6a362a5f65c1470399d869f0c39caac40e561a3.tar.bz2 | |
Don't convert 4444 images to 565.
Bug #3327175
Change-Id: I46d970e41947278f4c2476b347fd2403fe9a05e8
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 2b4a410..a773007 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -464,8 +464,8 @@ public final class Bitmap implements Parcelable { Rect srcR = new Rect(x, y, x + width, y + height); RectF dstR = new RectF(0, 0, width, height); - final Config newConfig = source.getConfig() == Config.ARGB_8888 ? - Config.ARGB_8888 : Config.RGB_565; + final Config newConfig = source.getConfig() == Config.ARGB_8888 || + source.getConfig() == Config.ARGB_4444 ? Config.ARGB_8888 : Config.RGB_565; if (m == null || m.isIdentity()) { bitmap = createBitmap(neww, newh, newConfig, source.hasAlpha()); |