commit 1ef98e32ccc4c6f3f69f812c1a92294065d80271
author Owen Lin <owenlin@google.com> Tue Sep 13 20:48:13 2011 +0800
committer Wei Huang <weih@google.com> Mon Sep 26 13:52:26 2011 -0700
tree 288f910a2a3b1adbec7641f8b5b434238ed71628
parent 5e3892a940615f5ba782a320707c186b79e296d1

(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

gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java

diff --git a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java
index aaf4f66..060d7f3 100644
--- a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java
+++ b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java
@@ -85,7 +85,7 @@
     // 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

src/com/android/gallery3d/data/DecodeUtils.java

diff --git a/src/com/android/gallery3d/data/DecodeUtils.java b/src/com/android/gallery3d/data/DecodeUtils.java
index d2b4ebc..afd5faa 100644
--- a/src/com/android/gallery3d/data/DecodeUtils.java
+++ b/src/com/android/gallery3d/data/DecodeUtils.java
@@ -110,7 +110,7 @@
      * Decodes the bitmap from the given byte array if the image size is larger than the given
      * requirement.
      *
-     * Note: The returned image may be resized down. However, both width and heigh must be
+     * Note: The returned image may be resized down. However, both width and height must be
      * larger than the <code>targetSize</code>.
      */
     public static Bitmap requestDecodeIfBigEnough(JobContext jc, byte[] data,

src/com/android/gallery3d/gadget/WidgetConfigure.java

diff --git a/src/com/android/gallery3d/gadget/WidgetConfigure.java b/src/com/android/gallery3d/gadget/WidgetConfigure.java
index 747cc3a..a871e24 100644
--- a/src/com/android/gallery3d/gadget/WidgetConfigure.java
+++ b/src/com/android/gallery3d/gadget/WidgetConfigure.java
@@ -48,6 +48,7 @@
     // Note: There is also a limit on the size of data that can be
     // passed in Binder's transaction.
     private static float WIDGET_SCALE_FACTOR = 1.5f;
+    private static int MAX_WIDGET_SIDE = 360;
 
     private int mAppWidgetId = -1;
     private int mWidgetType = 0;
@@ -115,10 +116,18 @@
 
     private void setChoosenPhoto(Intent data) {
         Resources res = getResources();
-        int widgetWidth = Math.round(WIDGET_SCALE_FACTOR
-                * res.getDimension(R.dimen.appwidget_width));
-        int widgetHeight = Math.round(WIDGET_SCALE_FACTOR
-                * res.getDimension(R.dimen.appwidget_height));
+
+        float width = res.getDimension(R.dimen.appwidget_width);
+        float height = res.getDimension(R.dimen.appwidget_height);
+
+        // We try to crop a larger image (by scale factor), but there is still
+        // a bound on the binder limit.
+        float scale = Math.min(WIDGET_SCALE_FACTOR,
+                MAX_WIDGET_SIDE / Math.max(width, height));
+
+        int widgetWidth = Math.round(width * scale);
+        int widgetHeight = Math.round(height * scale);
+
         mPickedItem = data.getData();
         Intent request = new Intent(CropImage.ACTION_CROP, mPickedItem)
                 .putExtra(CropImage.KEY_OUTPUT_X, widgetWidth)