PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Revert "Deduct padding from widget size only if padding has been inset"" into sc-dev am: 2af9d27116 am: d352253c2d

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

Change-Id: I95a54fa43c1de183fc1a15713334ea40ade045f2
This commit is contained in:
TreeHugger Robot
2021-06-18 11:32:21 +00:00
committed by Automerger Merge Worker
parent 9c334e4c5b d352253c2d
commit 78d86fa685
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/widget/util/WidgetSizes.java
+2 -4
View File
@@ -99,13 +99,11 @@ 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 = 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(