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: I019c5e41a7895f75954f22896e2bf44b7d76b707
This commit is contained in:
Steven Ng
2021-06-17 11:12:06 +00:00
committed by Automerger Merge Worker
@@ -99,11 +99,13 @@ public final class WidgetSizes {
*/
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(