(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

2 files changed, 14 insertions, 5 deletions

diff --git a/src/com/android/gallery3d/data/DecodeUtils.java b/src/com/android/gallery3d/data/DecodeUtils.java
index d2b4ebc4e..afd5faa66 100644
--- a/src/com/android/gallery3d/data/DecodeUtils.java
+++ b/src/com/android/gallery3d/data/DecodeUtils.java
@@ -110,7 +110,7 @@ public class DecodeUtils {
      * 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,
diff --git a/src/com/android/gallery3d/gadget/WidgetConfigure.java b/src/com/android/gallery3d/gadget/WidgetConfigure.java
index 747cc3a6d..a871e24fe 100644
--- a/src/com/android/gallery3d/gadget/WidgetConfigure.java
+++ b/src/com/android/gallery3d/gadget/WidgetConfigure.java
@@ -48,6 +48,7 @@ public class WidgetConfigure extends Activity {
     // 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 @@ public class WidgetConfigure extends Activity {
 
     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)