From 611dba4c9455ec34fa22201e70b6b7f4c9baad3a Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 2 Mar 2021 14:12:13 -0500 Subject: [PATCH] Use grid border spacing as widget padding if possible. Widget padding is added by the system to create reliable consistency between widgets. Now that we have added border spacing between cells on the launcher grid, we have significantly decreased the available space for widgets on home screens: widget padding is 8dp on all sides, border spacing is currently spec'd to be 16dp. We can inset the widget padding added by the system, and instead rely on the border spacing between cells to create reliable consistency between widgets. Bug: 175329686 Test: manual turn CellLayout#VISUALIZE_GRID debug flag on test drag and drop, resizing using drag handles view measurements in go/web-hv Change-Id: Iabb9f45e82e4ae039f55d7fd27fbd0d23be60191 --- src/com/android/launcher3/CellLayout.java | 17 ++++++++--- src/com/android/launcher3/DeviceProfile.java | 13 ++++++++ .../launcher3/ShortcutAndWidgetContainer.java | 13 ++++---- .../widget/LauncherAppWidgetProviderInfo.java | 8 +++-- .../widget/NavigableAppWidgetHostView.java | 30 ++++++++++++++++++- 5 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 947388bc7b..b8833cf1a9 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -53,6 +53,7 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import androidx.annotation.IntDef; +import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import com.android.launcher3.LauncherSettings.Favorites; @@ -2663,20 +2664,21 @@ public class CellLayout extends ViewGroup { } public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount, - int rowCount, int borderSpacing) { + int rowCount, int borderSpacing, @Nullable Rect inset) { setup(cellWidth, cellHeight, invertHorizontally, colCount, rowCount, 1.0f, 1.0f, - borderSpacing); + borderSpacing, inset); } /** - * Use this method, as opposed to {@link #setup(int, int, boolean, int, int, int)}, + * Use this method, as opposed to {@link #setup(int, int, boolean, int, int, int, Rect)}, * if the view needs to be scaled. * * ie. In multi-window mode, we setup widgets so that they are measured and laid out * using their full/invariant device profile sizes. */ public void setup(int cellWidth, int cellHeight, boolean invertHorizontally, int colCount, - int rowCount, float cellScaleX, float cellScaleY, int borderSpacing) { + int rowCount, float cellScaleX, float cellScaleY, int borderSpacing, + @Nullable Rect inset) { if (isLockedToGrid) { final int myCellHSpan = cellHSpan; final int myCellVSpan = cellVSpan; @@ -2697,6 +2699,13 @@ public class CellLayout extends ViewGroup { height = Math.round(myCellHeight) - topMargin - bottomMargin; x = leftMargin + (myCellX * cellWidth) + (myCellX * borderSpacing); y = topMargin + (myCellY * cellHeight) + (myCellY * borderSpacing); + + if (inset != null) { + x -= inset.left; + y -= inset.top; + width += inset.left + inset.right; + height += inset.top + inset.bottom; + } } } diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 7a9f852960..7beea74c0c 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -331,6 +331,19 @@ public class DeviceProfile { } } + /** + * We inset the widget padding added by the system and instead rely on the border spacing + * between cells to create reliable consistency between widgets + */ + public boolean shouldInsetWidgets() { + Rect widgetPadding = inv.defaultWidgetPadding; + + // Check all sides to ensure that the widget won't overlap into another cell. + return cellLayoutBorderSpacingPx > widgetPadding.left + && cellLayoutBorderSpacingPx > widgetPadding.top + && cellLayoutBorderSpacingPx > widgetPadding.right + && cellLayoutBorderSpacingPx > widgetPadding.bottom; + } public Builder toBuilder(Context context) { Point size = new Point(availableWidthPx, availableHeightPx); diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java index eab8272431..2c24c3a52e 100644 --- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java +++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java @@ -37,6 +37,8 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon. // return an (x, y) value from helper functions. Do NOT use them to maintain other state. private final int[] mTmpCellXY = new int[2]; + private final Rect mTempRect = new Rect(); + @ContainerType private final int mContainerType; private final WallpaperManager mWallpaperManager; @@ -101,11 +103,12 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon. CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams(); if (child instanceof LauncherAppWidgetHostView) { DeviceProfile profile = mActivity.getDeviceProfile(); + ((LauncherAppWidgetHostView) child).getWidgetInset(profile, mTempRect); lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY, - profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing); + profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect); } else { lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY, - mBorderSpacing); + mBorderSpacing, null); } } @@ -124,12 +127,12 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon. final DeviceProfile profile = mActivity.getDeviceProfile(); if (child instanceof LauncherAppWidgetHostView) { + ((LauncherAppWidgetHostView) child).getWidgetInset(profile, mTempRect); lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY, - profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing); - // Widgets have their own padding + profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect); } else { lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY, - mBorderSpacing); + mBorderSpacing, null); // Center the icon/folder int cHeight = getCellContentHeight(); int cellPaddingY = (int) Math.max(0, ((lp.height - cHeight) / 2f)); diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java index b0c85f19eb..ce97d2e294 100644 --- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java @@ -72,8 +72,12 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo // We want to account for the extra amount of padding that we are adding to the widget // to ensure that it gets the full amount of space that it has requested. - Rect widgetPadding = AppWidgetHostView.getDefaultPaddingForWidget( - context, provider, null); + // If grids supports insetting widgets, we do not account for widget padding. + Rect widgetPadding = new Rect(); + if (!idp.landscapeProfile.shouldInsetWidgets() + || !idp.portraitProfile.shouldInsetWidgets()) { + AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding); + } spanX = Math.max(1, (int) Math.ceil( (minWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth)); spanY = Math.max(1, (int) Math.ceil( diff --git a/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java b/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java index ed42bc42a0..6163b5199c 100644 --- a/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java +++ b/src/com/android/launcher3/widget/NavigableAppWidgetHostView.java @@ -17,6 +17,7 @@ package com.android.launcher3.widget; import android.appwidget.AppWidgetHostView; +import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.graphics.PointF; import android.graphics.Rect; @@ -25,8 +26,11 @@ import android.view.View; import android.view.ViewDebug; import android.view.ViewGroup; +import com.android.launcher3.BaseActivity; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Reorderable; import com.android.launcher3.dragndrop.DraggableView; +import com.android.launcher3.views.ActivityContext; import java.util.ArrayList; @@ -50,11 +54,16 @@ public abstract class NavigableAppWidgetHostView extends AppWidgetHostView private final PointF mTranslationForReorderPreview = new PointF(0, 0); private float mScaleForReorderBounce = 1f; + private final Rect mTempRect = new Rect(); + @ViewDebug.ExportedProperty(category = "launcher") private boolean mChildrenFocused; + protected final BaseActivity mActivity; + public NavigableAppWidgetHostView(Context context) { super(context); + mActivity = ActivityContext.lookupContext(context); } @Override @@ -222,6 +231,25 @@ public abstract class NavigableAppWidgetHostView extends AppWidgetHostView int width = (int) (getMeasuredWidth() * mScaleToFit); int height = (int) (getMeasuredHeight() * mScaleToFit); - bounds.set(0, 0 , width, height); + getWidgetInset(mActivity.getDeviceProfile(), mTempRect); + bounds.set(mTempRect.left, mTempRect.top, width - mTempRect.right, + height - mTempRect.bottom); + } + + /** + * Widgets have padding added by the system. We may choose to inset this padding if the grid + * supports it. + */ + public void getWidgetInset(DeviceProfile grid, Rect out) { + if (!grid.shouldInsetWidgets()) { + out.setEmpty(); + return; + } + AppWidgetProviderInfo info = getAppWidgetInfo(); + if (info == null) { + out.set(grid.inv.defaultWidgetPadding); + } else { + AppWidgetHostView.getDefaultPaddingForWidget(getContext(), info.provider, out); + } } }