Merge "Avoid crash when widget previews have no intrinsic size" into ub-launcher3-edmonton (b38170a7) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/WidgetPreviewLoader.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -338,7 +338,8 @@ public class WidgetPreviewLoader {
		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 @@ public class WidgetPreviewLoader {
		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