commit c3252e6da1c7029361d6eddcc3535e624f11626f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 10 19:31:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 10 19:31:14 2021 +0000
tree 206a46f1d0adc6ef95e005e9ba6e2498c82c0e33
parent 69aa05590064b66ce4687ac33095e002ba39fde8
parent c873fb5ec8ab3929cf39d465db326b66426d4619

Merge "Use target size to scale down a widget preview image" into sc-v2-dev am: 26b25c222c am: c873fb5ec8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15502874

Change-Id: I2be7f16308a41a85f747ff4dc0d680a64f70fedc

src/com/android/launcher3/widget/WidgetCell.java

diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 167eb09..a8ed154 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -325,10 +325,10 @@
             return;
         }
         if (drawable != null) {
+            // Scale down the preview size if it's wider than the cell.
             float scale = 1f;
-            if (getWidth() > 0 && getHeight() > 0) {
-                // Scale down the preview size if it's wider than the cell.
-                float maxWidth = getWidth();
+            if (mTargetPreviewWidth > 0) {
+                float maxWidth = mTargetPreviewWidth;
                 float previewWidth = drawable.getIntrinsicWidth() * mPreviewContainerScale;
                 scale = Math.min(maxWidth / previewWidth, 1);
             }