summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-10 16:41:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 16:41:59 -0700
commitde60c072c772d6e3b945d15afcaf5176ff5faadc (patch)
tree9ff679efee3259ca5916497ca079e3d654785e1b /src
parentf068ecf5772a339f2f64524ea8a977218b04a0ad (diff)
parent53f24f0fbfd787a4ab2f129499d2c7ef240a517f (diff)
downloadandroid_packages_apps_Gallery2-de60c072c772d6e3b945d15afcaf5176ff5faadc.tar.gz
android_packages_apps_Gallery2-de60c072c772d6e3b945d15afcaf5176ff5faadc.tar.bz2
android_packages_apps_Gallery2-de60c072c772d6e3b945d15afcaf5176ff5faadc.zip
am 53f24f0f: forced fx bitmaps to load unscaled
* commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index aca7f4280..f204e4020 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -425,9 +425,11 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
};
preset[p++] = new ImagePreset();
+ BitmapFactory.Options o = new BitmapFactory.Options();
+ o.inScaled = false;
for (int i = 0; i < drawid.length; i++) {
- Bitmap b = BitmapFactory.decodeResource(getResources(), drawid[i]);
+ Bitmap b = BitmapFactory.decodeResource(getResources(), drawid[i], o);
preset[p++] = new ImagePresetFX(b, getString(fxNameid[i]));
}