diff options
author | Owen Lin <owenlin@google.com> | 2011-09-13 20:48:13 +0800 |
---|---|---|
committer | Wei Huang <weih@google.com> | 2011-09-26 13:52:26 -0700 |
commit | c60f487e401b57bca03930204d93ad248e6323a6 (patch) | |
tree | 9329596223f4db7b8e4746dff8aab8d62110f075 | |
parent | d784763aec4ae3b3dac4e1d770c4249b8f6214aa (diff) | |
download | android_packages_apps_Snap-c60f487e401b57bca03930204d93ad248e6323a6.tar.gz android_packages_apps_Snap-c60f487e401b57bca03930204d93ad248e6323a6.tar.bz2 android_packages_apps_Snap-c60f487e401b57bca03930204d93ad248e6323a6.zip |
(DO NOT MERGE)
Add a hard limit on the size of the widget images.
There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.
Also adjust the size of widget to make it looks better.
Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.
Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9
fix: 5273271
-rw-r--r-- | gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java index aaf4f6665..060d7f32e 100644 --- a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java +++ b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java @@ -85,7 +85,7 @@ public class BitmapUtils { // minSideLength long. If that's not possible, return 1. public static int computeSampleSizeLarger(int w, int h, int minSideLength) { - int initialSize = Math.min(w / minSideLength, h / minSideLength); + int initialSize = Math.max(w / minSideLength, h / minSideLength); if (initialSize <= 1) return 1; return initialSize <= 8 |