am bc71d625: Merge "Don\'t convert 4444 images to 565. Bug #3327175" into honeycomb

* commit 'bc71d62581104b27d8373893c5485958b6f8ca37':
  Don't convert 4444 images to 565. Bug #3327175
This commit is contained in:
Romain Guy
2011-01-31 22:07:17 -08:00
committed by Android Git Automerger

View File

@@ -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());