summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-08-20 16:01:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-20 16:01:03 -0700
commit901f3aea8c5644c567618410f9062d96d2527e70 (patch)
treec8268e4b4784dd8f30b8847ee5d7e83f5308003f
parent6529e798150f147feaf9445edbb27c4535a48fef (diff)
parent1ee2d47e1dc72662cb63ba8c223d98f05e57ffea (diff)
downloadandroid_packages_apps_Gallery2-901f3aea8c5644c567618410f9062d96d2527e70.tar.gz
android_packages_apps_Gallery2-901f3aea8c5644c567618410f9062d96d2527e70.tar.bz2
android_packages_apps_Gallery2-901f3aea8c5644c567618410f9062d96d2527e70.zip
am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
* commit '1ee2d47e1dc72662cb63ba8c223d98f05e57ffea': Revert to loading 8888 bitmaps
-rw-r--r--src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
index 5695ef53e..9a494d823 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
@@ -184,7 +184,6 @@ public abstract class ImageFilterRS extends ImageFilter {
public Allocation loadScaledResourceAlpha(int resource, int inSampleSize) {
Resources res = getEnvironment().getPipeline().getResources();
final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inPreferredConfig = Bitmap.Config.ALPHA_8;
options.inSampleSize = inSampleSize;
Bitmap bitmap = BitmapFactory.decodeResource(
res,
@@ -197,7 +196,6 @@ public abstract class ImageFilterRS extends ImageFilter {
public Allocation loadScaledResourceAlpha(int resource, int w, int h, int inSampleSize) {
Resources res = getEnvironment().getPipeline().getResources();
final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inPreferredConfig = Bitmap.Config.ALPHA_8;
options.inSampleSize = inSampleSize;
Bitmap bitmap = BitmapFactory.decodeResource(
res,