Merge "Revert "Deduct padding from widget size only if padding has been inset"" into sc-dev am: 2af9d27116
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15026671
Change-Id: I2d6341b7029a25f7c2d8b88d769efea756983ae4
diff --git a/src/com/android/launcher3/widget/util/WidgetSizes.java b/src/com/android/launcher3/widget/util/WidgetSizes.java
index fcc0dde..5c8ea72 100644
--- a/src/com/android/launcher3/widget/util/WidgetSizes.java
+++ b/src/com/android/launcher3/widget/util/WidgetSizes.java
@@ -99,13 +99,11 @@
*/
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 = shouldInsetWidgets ? (padding.left + padding.right) / density : 0;
- float yPaddingDips = shouldInsetWidgets ? (padding.top + padding.bottom) / density : 0;
+ float xPaddingDips = (padding.left + padding.right) / density;
+ float yPaddingDips = (padding.top + padding.bottom) / density;
ArrayList<SizeF> paddedSizes = sizes.stream()
.map(size -> new SizeF(