commit 26b25c222c721bf6631cd2c3280d0cd0cb88dae9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 10 19:01:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 10 19:01:45 2021 +0000
tree 86b1784ef7325b88875e99ddaee580fe33cc4975
parent 49ee541bc58b59f96d195c0710ed36915d465ac7
parent caf2e5f350ef99dcb31dc1dd71d8a4a4f9ce954d

Merge "Use target size to scale down a widget preview image" into sc-v2-dev

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);
             }