PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f51b706439

Change-Id: I801969e037a0f8e41c536b695a3acb67d4e1f599
This commit is contained in:
Sunny Goyal
2018-04-26 11:14:51 -07:00
committed by android-build-merger
parent ca82c97e62 f51b706439
commit d1689bfca2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/WidgetPreviewLoader.java
+4 -3
View File
@@ -340,7 +340,8 @@ public class WidgetPreviewLoader {
int previewWidth; int previewWidth;
int previewHeight; int previewHeight;
if (widgetPreviewExists) { if (widgetPreviewExists && drawable.getIntrinsicWidth() > 0
&& drawable.getIntrinsicHeight() > 0) {
previewWidth = drawable.getIntrinsicWidth(); previewWidth = drawable.getIntrinsicWidth();
previewHeight = drawable.getIntrinsicHeight(); previewHeight = drawable.getIntrinsicHeight();
} else { } else {
@@ -360,8 +361,8 @@ public class WidgetPreviewLoader {
scale = maxPreviewWidth / (float) (previewWidth); scale = maxPreviewWidth / (float) (previewWidth);
} }
if (scale != 1f) { if (scale != 1f) {
previewWidth = (int) (scale * previewWidth); previewWidth = Math.max((int)(scale * previewWidth), 1);
previewHeight = (int) (scale * previewHeight); 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 // If a bitmap is passed in, we use it; otherwise, we create a bitmap of the right size