commit 8b8de4ccab772798c4ebd9ad57f5fe6001b864c1
author Steven Ng <stevenckng@google.com> Thu Jun 17 11:12:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 17 11:12:59 2021 +0000
tree 8b182c8f7c8d6bc9c5ab7d3bfb5eb8b03710e6bd
parent d417d36615bd11255107aec030b3720df7565a0c
parent 6ce6922c14e0f857908b65ca960823a25b72edb8

Merge "Deduct padding from widget size only if padding has been inset" into sc-dev am: 6ce6922c14

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

Change-Id: Ia896edc6e95a0c61f228159e9e45d164cb3b97a5

src/com/android/launcher3/widget/util/WidgetSizes.java

diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index 5c8ea72..fcc0dde 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -99,11 +99,13 @@
      */
     public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
             int spanY) {
+        boolean shouldInsetWidgets =
+                LauncherAppState.getIDP(context).getDeviceProfile(context).shouldInsetWidgets();
         ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);
         Rect padding = getDefaultPaddingForWidget(context, provider, null);
         float density = context.getResources().getDisplayMetrics().density;
-        float xPaddingDips = (padding.left + padding.right) / density;
-        float yPaddingDips = (padding.top + padding.bottom) / density;
+        float xPaddingDips = shouldInsetWidgets ? (padding.left + padding.right) / density : 0;
+        float yPaddingDips = shouldInsetWidgets ? (padding.top + padding.bottom) / density : 0;
 
         ArrayList<SizeF> paddedSizes = sizes.stream()
                 .map(size -> new SizeF(