commit 9e4f3ca0dd8214d0adf218eb00748d41d07a9643
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 27 09:36:09 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 27 09:36:09 2018 +0000
tree 9d3bed458d6c3a66b6e66593900f038393fcd2f6
parent 47be8dc08cadd9c8d32f424f0859e605a4ea3ad7
parent 94ef39116a20a6700824d0b9ab6e372e8a124aba

Snap for 4748783 from 94ef39116a20a6700824d0b9ab6e372e8a124aba to qt-release

Change-Id: I5bc657229d9fdd8df5041707a9ad3b49f650ce0a

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index a658d58..7af4bf9 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -338,7 +338,8 @@
         int previewWidth;
         int previewHeight;
 
-        if (widgetPreviewExists) {
+        if (widgetPreviewExists && drawable.getIntrinsicWidth() > 0
+                && drawable.getIntrinsicHeight() > 0) {
             previewWidth = drawable.getIntrinsicWidth();
             previewHeight = drawable.getIntrinsicHeight();
         } else {
@@ -358,8 +359,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