commit f51b706439ad7ed98f2f7de0a50d427e2a7fd632
author Sunny Goyal <sunnygoyal@google.com> Thu Apr 26 17:43:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 26 17:43:36 2018 +0000
tree f7b4d577f5828766e8641eb6f1b1231352a89cf2
parent 8ef0aff59308512d57eb48891e5c53b3bfbb0101
parent 8991090dc3315a4686d2913bd53341d81e179b6e

Merge "Avoid crash when widget previews have no intrinsic size"

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index a65ea9b..e8c1361 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -340,7 +340,8 @@
         int previewWidth;
         int previewHeight;
 
-        if (widgetPreviewExists) {
+        if (widgetPreviewExists && drawable.getIntrinsicWidth() > 0
+                && drawable.getIntrinsicHeight() > 0) {
             previewWidth = drawable.getIntrinsicWidth();
             previewHeight = drawable.getIntrinsicHeight();
         } else {
@@ -360,8 +361,8 @@
             scale = maxPreviewWidth / (float) (previewWidth);
         }
         if (scale != 1f) {
-            previewWidth = (int) (scale * previewWidth);
-            previewHeight = (int) (scale * previewHeight);
+            previewWidth = Math.max((int)(scale * previewWidth), 1);
+            previewHeight = Math.max((int)(scale * previewHeight), 1);
         }
 
         // If a bitmap is passed in, we use it; otherwise, we create a bitmap of the right size