summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-08-19 10:47:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-19 10:47:41 -0700
commit646b64cf9d52100ad31e8de45256792b5057cbdb (patch)
tree7cc1409fab8c76e4d94b810e476f612663fb99a3 /graphics/java/android
parent495111eaaf13cad145b6c629c0f375401bb192dc (diff)
parent4b7cc6402892a92b820423561d1443d18e25b755 (diff)
downloadframeworks_base-646b64cf9d52100ad31e8de45256792b5057cbdb.zip
frameworks_base-646b64cf9d52100ad31e8de45256792b5057cbdb.tar.gz
frameworks_base-646b64cf9d52100ad31e8de45256792b5057cbdb.tar.bz2
Merge "Load opaque assets in RGB-565 until Bitmap.hasAlpha() works properly."
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index d2845cf..afea767 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -69,11 +69,8 @@ public class BitmapFactory {
* the decoder will try to pick the best matching config based on the
* system's screen depth, and characteristics of the original image such
* as if it has per-pixel alpha (requiring a config that also does).
- *
- * The configuration is set to {@link android.graphics.Bitmap.Config#ARGB_8888}
- * by default.
*/
- public Bitmap.Config inPreferredConfig = Bitmap.Config.ARGB_8888;
+ public Bitmap.Config inPreferredConfig;
/**
* If dither is true, the decoder will attempt to dither the decoded