Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1689bfc authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

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

am: f51b7064

Change-Id: I801969e037a0f8e41c536b695a3acb67d4e1f599
parents ca82c97e f51b7064

src/com/android/launcher3/WidgetPreviewLoader.java

+4 −3
Original line number Diff line number Diff line
@@ -340,7 +340,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 {
@@ -360,8 +361,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