From e126d72fa8602e31fbb87d4b6e5d5ccac34a32d0 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Thu, 25 Feb 2021 10:45:20 -0500 Subject: [PATCH 1/7] More grid changes, closer to final specs. * Added isScalable, minCellWidth, minCellHeight, and borderSpacing attrs When isScalable is true, we use set workspace cell values to minCellWidth/minCellHeight and then scale the cell values to fit the available space. This allows us to have consistent aspect ratios when two devices match the display/grid options. This is different from the dynamic grid, which calculates cell values based on iconSize/textSize/etc and then allows the cell width to be as wide as space allows. I adjusted some variables so that they will auto adjust based on another value, indepenent from whether the grid isScalable or not. An example of this is the folder label text, where it's always set to be 1.14x of whatever the workspace icon text size is. This is so we don't need to add a bunch of more variables to DisplayOption/GridOption. Bug: 175329686 Test: - switching between device profiles, - testing folder open/close - testing in multiwindow - testing in landscape Change-Id: Ia469ae0d65b518469ef264b726db46f4a3210056 --- res/layout/folder_application.xml | 3 +- res/layout/user_folder_icon_normalized.xml | 10 +- res/values/attrs.xml | 8 + res/values/config.xml | 2 +- res/values/dimens.xml | 16 +- .../launcher3/AppWidgetResizeFrame.java | 33 ++-- src/com/android/launcher3/BubbleTextView.java | 3 +- src/com/android/launcher3/DeviceProfile.java | 146 ++++++++++++------ .../launcher3/InvariantDeviceProfile.java | 43 ++++++ src/com/android/launcher3/ResourceUtils.java | 8 +- src/com/android/launcher3/folder/Folder.java | 13 +- .../folder/FolderAnimationManager.java | 4 +- 12 files changed, 204 insertions(+), 85 deletions(-) diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index 32a5419b8e..1cdee08c25 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -21,4 +21,5 @@ android:textColor="?attr/folderTextColor" android:includeFontPadding="false" android:hapticFeedbackEnabled="false" - launcher:iconDisplay="folder" /> + launcher:iconDisplay="folder" + launcher:centerVertically="true" /> diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index c230dadd8f..d38a77a623 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -27,15 +27,12 @@ android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" launcher:pageIndicator="@+id/folder_page_indicator" /> + android:textColorHint="?attr/folderHintColor"/> + + @@ -150,6 +152,12 @@ + + + + + + diff --git a/res/values/config.xml b/res/values/config.xml index 41d1a12059..89415b89a3 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -24,7 +24,7 @@ - 90 + 85 50 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index acc6466caa..e532305599 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -20,6 +20,7 @@ 8dp + 8dp 7dp 8dp @@ -27,7 +28,6 @@ 16dp 5.5dp 8dp - 7dp 8dp @@ -37,6 +37,9 @@ 34dp 0dp + + 22dp + 24dp 1dp @@ -90,7 +93,6 @@ 2dp - 3dp 16dp @@ -148,10 +150,12 @@ 9dp 6dp - 13sp - 12dp - 12dp - 16sp + + 1.14 + 48dp + + 8dp + 16dp 24dp diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index be92c5d133..4f008e26da 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -3,7 +3,6 @@ package com.android.launcher3; import static com.android.launcher3.LauncherAnimUtils.LAYOUT_HEIGHT; import static com.android.launcher3.LauncherAnimUtils.LAYOUT_WIDTH; import static com.android.launcher3.Utilities.ATLEAST_S; -import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS; import static com.android.launcher3.views.BaseDragLayer.LAYOUT_X; import static com.android.launcher3.views.BaseDragLayer.LAYOUT_Y; @@ -50,6 +49,14 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O inv.portraitProfile.getCellSize()}; }); + // Represents the border spacing size on the grid in the two orientations. + public static final MainThreadInitializedObject BORDER_SPACING_SIZE = + new MainThreadInitializedObject<>(c -> { + InvariantDeviceProfile inv = LauncherAppState.getIDP(c); + return new int[] {inv.landscapeProfile.cellLayoutBorderSpacingPx, + inv.portraitProfile.cellLayoutBorderSpacingPx}; + }); + private static final int HANDLE_COUNT = 4; private static final int INDEX_LEFT = 0; private static final int INDEX_TOP = 1; @@ -370,16 +377,12 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O } } - private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY) { + private static PointF getWidgetSize(Context context, Point cellSize, int spanX, int spanY, + int borderSpacing) { final float density = context.getResources().getDisplayMetrics().density; - float hBorderSpacing = 0; - float vBorderSpacing = 0; - if (ENABLE_FOUR_COLUMNS.get()) { - final int borderSpacing = context.getResources() - .getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing); - hBorderSpacing = (spanX - 1) * borderSpacing; - vBorderSpacing = (spanY - 1) * borderSpacing; - } + final float hBorderSpacing = (spanX - 1) * borderSpacing; + final float vBorderSpacing = (spanY - 1) * borderSpacing; + PointF widgetSize = new PointF(); widgetSize.x = ((spanX * cellSize.x) + hBorderSpacing) / density; widgetSize.y = ((spanY * cellSize.y) + vBorderSpacing) / density; @@ -389,10 +392,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O /** Returns the actual widget size given its span. */ public static PointF getWidgetSize(Context context, int spanX, int spanY) { final Point[] cellSize = CELL_SIZE.get(context); + final int[] borderSpacing = BORDER_SPACING_SIZE.get(context); if (isLandscape(context)) { - return getWidgetSize(context, cellSize[0], spanX, spanY); + return getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]); } - return getWidgetSize(context, cellSize[1], spanX, spanY); + return getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]); } /** Returns true if the screen is in landscape mode. */ @@ -404,9 +408,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O /** Returns the list of sizes for a widget of given span, in dp. */ public static ArrayList getWidgetSizes(Context context, int spanX, int spanY) { final Point[] cellSize = CELL_SIZE.get(context); + final int[] borderSpacing = BORDER_SPACING_SIZE.get(context); - PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY); - PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY); + PointF landSize = getWidgetSize(context, cellSize[0], spanX, spanY, borderSpacing[0]); + PointF portSize = getWidgetSize(context, cellSize[1], spanX, spanY, borderSpacing[1]); ArrayList sizes = new ArrayList<>(2); sizes.add(landSize); diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index ee4d7ecb55..e0be6de793 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -17,7 +17,6 @@ package com.android.launcher3; import static com.android.launcher3.FastBitmapDrawable.newIcon; -import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS; import static com.android.launcher3.graphics.IconShape.getShape; import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon; import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound; @@ -194,7 +193,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx); setCompoundDrawablePadding(grid.iconDrawablePaddingPx); defaultIconSize = grid.iconSizePx; - setCenterVertically(ENABLE_FOUR_COLUMNS.get()); + setCenterVertically(grid.isScalableGrid); } else if (mDisplay == DISPLAY_ALL_APPS) { setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx); setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx); diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 634093c141..7a9f852960 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -16,7 +16,7 @@ package com.android.launcher3; -import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS; +import static com.android.launcher3.ResourceUtils.pxFromDp; import android.content.Context; import android.content.res.Configuration; @@ -66,6 +66,8 @@ public class DeviceProfile { public final float aspectRatio; + public final boolean isScalableGrid; + /** * The maximum amount of left/right workspace padding as a percentage of the screen width. * To be clear, this means that up to 7% of the screen width can be used as left padding, and @@ -79,8 +81,10 @@ public class DeviceProfile { private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4; // Workspace - public final int desiredWorkspaceLeftRightMarginPx; - public final int cellLayoutBorderSpacingPx; + public final int desiredWorkspaceLeftRightOriginalPx; + public int desiredWorkspaceLeftRightMarginPx; + public final int cellLayoutBorderSpacingOriginalPx; + public int cellLayoutBorderSpacingPx; public final int cellLayoutPaddingLeftRightPx; public final int cellLayoutBottomPaddingPx; public final int edgeMarginPx; @@ -102,13 +106,21 @@ public class DeviceProfile { public int cellWidthPx; public int cellHeightPx; - public int cellYPaddingPx; public int workspaceCellPaddingXPx; + public int cellYPaddingPx; + public int cellYPaddingOriginalPx; + // Folder + public float folderLabelTextScale; + public int folderLabelTextSizePx; public int folderIconSizePx; public int folderIconOffsetYPx; + // Folder content + public int folderContentPaddingLeftRight; + public int folderContentPaddingTop; + // Folder cell public int folderCellWidthPx; public int folderCellHeightPx; @@ -164,9 +176,12 @@ public class DeviceProfile { this.inv = inv; this.isLandscape = isLandscape; this.isMultiWindowMode = isMultiWindowMode; + this.transposeLayoutWithOrientation = transposeLayoutWithOrientation; windowX = windowPosition.x; windowY = windowPosition.y; + isScalableGrid = inv.isScalable && !isVerticalBarLayout() && !isMultiWindowMode; + // Determine sizes. widthPx = width; heightPx = height; @@ -193,8 +208,6 @@ public class DeviceProfile { boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0; // Some more constants - this.transposeLayoutWithOrientation = transposeLayoutWithOrientation; - context = getContext(context, info, isVerticalBarLayout() ? Configuration.ORIENTATION_LANDSCAPE : Configuration.ORIENTATION_PORTRAIT); @@ -217,16 +230,25 @@ public class DeviceProfile { availableHeightPx = nonFinalAvailableHeightPx; edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin); - desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx; - cellYPaddingPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_y); - cellLayoutBorderSpacingPx = isVerticalBarLayout() - || isMultiWindowMode - || !ENABLE_FOUR_COLUMNS.get() - ? 0 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing); + desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : isScalableGrid + ? res.getDimensionPixelSize(R.dimen.scalable_grid_left_right_margin) + : res.getDimensionPixelSize(R.dimen.dynamic_grid_left_right_margin); + desiredWorkspaceLeftRightOriginalPx = desiredWorkspaceLeftRightMarginPx; + + folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale); + folderContentPaddingLeftRight = + res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right); + folderContentPaddingTop = res.getDimensionPixelSize(R.dimen.folder_content_padding_top); + + setCellLayoutBorderSpacing(pxFromDp(inv.borderSpacing, mInfo.metrics, 1f)); + cellLayoutBorderSpacingOriginalPx = cellLayoutBorderSpacingPx; + int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1; - int cellLayoutPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); + int cellLayoutPadding = isScalableGrid + ? 0 + : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); if (isLandscape) { cellLayoutPaddingLeftRightPx = 0; cellLayoutBottomPaddingPx = cellLayoutPadding; @@ -259,16 +281,16 @@ public class DeviceProfile { hotseatBarSidePaddingStartPx = isVerticalBarLayout() ? workspacePageIndicatorHeight : 0; int hotseatExtraVerticalSize = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size); - hotseatBarSizePx = ResourceUtils.pxFromDp(inv.iconSize, mInfo.metrics) + hotseatBarSizePx = pxFromDp(inv.iconSize, mInfo.metrics, 1f) + (isVerticalBarLayout() ? (hotseatBarSidePaddingStartPx + hotseatBarSidePaddingEndPx) : (hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx - + (ENABLE_FOUR_COLUMNS.get() ? 0 : hotseatExtraVerticalSize))); + + (isScalableGrid ? 0 : hotseatExtraVerticalSize))); // Calculate all of the remaining variables. int extraSpace = updateAvailableDimensions(res); // Now that we have all of the variables calculated, we can tune certain sizes. - if (ENABLE_FOUR_COLUMNS.get()) { + if (isScalableGrid) { DevicePadding padding = inv.devicePaddings.getDevicePadding(extraSpace); workspaceTopPadding = padding.getWorkspaceTopPadding(extraSpace); workspaceBottomPadding = padding.getWorkspaceBottomPadding(extraSpace); @@ -299,6 +321,17 @@ public class DeviceProfile { IconShape.DEFAULT_PATH_SIZE); } + private void setCellLayoutBorderSpacing(int borderSpacing) { + if (isScalableGrid) { + cellLayoutBorderSpacingPx = borderSpacing; + folderContentPaddingLeftRight = borderSpacing; + folderContentPaddingTop = borderSpacing; + } else { + cellLayoutBorderSpacingPx = 0; + } + } + + public Builder toBuilder(Context context) { Point size = new Point(availableWidthPx, availableHeightPx); return new Builder(context, inv, mInfo) @@ -380,20 +413,42 @@ public class DeviceProfile { private int updateAvailableDimensions(Resources res) { updateIconSize(1f, res); - // Check to see if the icons fit within the available height. If not, then scale down. - float usedHeight = (cellHeightPx * inv.numRows) - + (cellLayoutBorderSpacingPx * (inv.numRows - 1)); - int maxHeight = (availableHeightPx - getTotalWorkspacePadding().y); + Point workspacePadding = getTotalWorkspacePadding(); + + // Check to see if the icons fit within the available height. + float usedHeight = getCellLayoutHeight(); + final int maxHeight = availableHeightPx - workspacePadding.y; float extraHeight = Math.max(0, maxHeight - usedHeight); - if (usedHeight > maxHeight) { - float scale = maxHeight / usedHeight; - updateIconSize(scale, res); - extraHeight = 0; + float scaleY = maxHeight / usedHeight; + boolean shouldScale = scaleY < 1f; + + float scaleX = 1f; + if (isScalableGrid) { + // We scale to fit the cellWidth and cellHeight in the available space. + // The benefit of scalable grids is that we can get consistent aspect ratios between + // devices. + float usedWidth = (cellWidthPx * inv.numColumns) + + (cellLayoutBorderSpacingPx * (inv.numColumns - 1)) + + (desiredWorkspaceLeftRightMarginPx * 2); + // We do not subtract padding here, as we also scale the workspace padding if needed. + scaleX = availableWidthPx / usedWidth; + shouldScale = true; } + + if (shouldScale) { + float scale = Math.min(scaleX, scaleY); + updateIconSize(scale, res); + extraHeight = Math.max(0, maxHeight - getCellLayoutHeight()); + } + updateAvailableFolderCellDimensions(res); return Math.round(extraHeight); } + private int getCellLayoutHeight() { + return (cellHeightPx * inv.numRows) + (cellLayoutBorderSpacingPx * (inv.numRows - 1)); + } + /** * Updating the iconSize affects many aspects of the launcher layout, such as: iconSizePx, * iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants, @@ -403,17 +458,21 @@ public class DeviceProfile { // Workspace final boolean isVerticalLayout = isVerticalBarLayout(); float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize; - iconSizePx = Math.max(1, (int) (ResourceUtils.pxFromDp(invIconSizeDp, mInfo.metrics) - * scale)); - iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale); + iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale)); + iconTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale); iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale); - if (ENABLE_FOUR_COLUMNS.get()) { - cellHeightPx = iconSizePx + iconDrawablePaddingPx - + Utilities.calculateTextHeight(iconTextSizePx) - + (cellYPaddingPx * 2); + setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale)); + + if (isScalableGrid) { + cellWidthPx = pxFromDp(inv.minCellWidth, mInfo.metrics, scale); + cellHeightPx = pxFromDp(inv.minCellHeight, mInfo.metrics, scale); + int cellContentHeight = iconSizePx + iconDrawablePaddingPx + + Utilities.calculateTextHeight(iconTextSizePx); + cellYPaddingPx = Math.max(0, cellHeightPx - cellContentHeight) / 2; + desiredWorkspaceLeftRightMarginPx = (int) (desiredWorkspaceLeftRightOriginalPx * scale); } else { - cellYPaddingPx = 0; + cellWidthPx = iconSizePx + iconDrawablePaddingPx; cellHeightPx = iconSizePx + iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx); int cellPaddingY = (getCellSize().y - cellHeightPx) / 2; @@ -426,11 +485,10 @@ public class DeviceProfile { iconDrawablePaddingPx = cellPaddingY; } } - cellWidthPx = iconSizePx + iconDrawablePaddingPx; // All apps if (allAppsHasDifferentNumColumns()) { - allAppsIconSizePx = ResourceUtils.pxFromDp(inv.allAppsIconSize, mInfo.metrics); + allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mInfo.metrics); allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics); allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx; // We use 4 below to ensure labels are closer to their corresponding icon. @@ -474,12 +532,10 @@ public class DeviceProfile { } private void updateAvailableFolderCellDimensions(Resources res) { - int folderBottomPanelSize = res.getDimensionPixelSize(R.dimen.folder_label_padding_top) - + res.getDimensionPixelSize(R.dimen.folder_label_padding_bottom) - + Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_label_text_size)); - updateFolderCellSize(1f, res); + final int folderBottomPanelSize = res.getDimensionPixelSize(R.dimen.folder_label_height); + // Don't let the folder get too close to the edges of the screen. int folderMargin = edgeMarginPx * 2; Point totalWorkspacePadding = getTotalWorkspacePadding(); @@ -488,13 +544,14 @@ public class DeviceProfile { float contentUsedHeight = folderCellHeightPx * inv.numFolderRows + ((inv.numFolderRows - 1) * cellLayoutBorderSpacingPx); int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderBottomPanelSize - - folderMargin; + - folderMargin - folderContentPaddingTop; float scaleY = contentMaxHeight / contentUsedHeight; // Check if the icons fit within the available width. float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns + ((inv.numFolderColumns - 1) * cellLayoutBorderSpacingPx); - int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin; + int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin + - folderContentPaddingLeftRight * 2; float scaleX = contentMaxWidth / contentUsedWidth; float scale = Math.min(scaleX, scaleY); @@ -504,9 +561,10 @@ public class DeviceProfile { } private void updateFolderCellSize(float scale, Resources res) { - folderChildIconSizePx = (int) (ResourceUtils.pxFromDp(inv.iconSize, mInfo.metrics) * scale); - folderChildTextSizePx = - (int) (res.getDimensionPixelSize(R.dimen.folder_child_text_size) * scale); + float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize; + folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale)); + folderChildTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale); + folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale); int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx); int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale); @@ -588,7 +646,7 @@ public class DeviceProfile { } else { // Pad the top and bottom of the workspace with search/hotseat bar sizes padding.set(desiredWorkspaceLeftRightMarginPx, - workspaceTopPadding + edgeMarginPx, + workspaceTopPadding + (isScalableGrid ? 0 : edgeMarginPx), desiredWorkspaceLeftRightMarginPx, paddingBottom); } diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 2a08c50008..bb60557122 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -111,6 +111,10 @@ public class InvariantDeviceProfile { public float allAppsIconSize; public float allAppsIconTextSize; + public float minCellHeight; + public float minCellWidth; + public float borderSpacing; + private SparseArray mExtraAttrs; /** @@ -123,6 +127,11 @@ public class InvariantDeviceProfile { */ public int numAllAppsColumns; + /** + * Do not query directly. see {@link DeviceProfile#isScalableGrid}. + */ + protected boolean isScalable; + public String dbFile; public int defaultLayoutId; int demoModeLayoutId; @@ -154,6 +163,10 @@ public class InvariantDeviceProfile { iconTextSize = p.iconTextSize; numHotseatIcons = p.numHotseatIcons; numAllAppsColumns = p.numAllAppsColumns; + isScalable = p.isScalable; + minCellHeight = p.minCellHeight; + minCellWidth = p.minCellWidth; + borderSpacing = p.borderSpacing; dbFile = p.dbFile; allAppsIconSize = p.allAppsIconSize; allAppsIconTextSize = p.allAppsIconTextSize; @@ -213,6 +226,9 @@ public class InvariantDeviceProfile { result.landscapeIconSize = defaultDisplayOption.landscapeIconSize; result.allAppsIconSize = Math.min( defaultDisplayOption.allAppsIconSize, myDisplayOption.allAppsIconSize); + result.minCellHeight = defaultDisplayOption.minCellHeight; + result.minCellWidth = defaultDisplayOption.minCellWidth; + result.borderSpacing = defaultDisplayOption.borderSpacing; devicePaddings = new DevicePaddings(context); initGrid(context, myInfo, result); @@ -259,6 +275,7 @@ public class InvariantDeviceProfile { numFolderRows = closestProfile.numFolderRows; numFolderColumns = closestProfile.numFolderColumns; numAllAppsColumns = closestProfile.numAllAppsColumns; + isScalable = closestProfile.isScalable; mExtraAttrs = closestProfile.extraAttrs; @@ -269,6 +286,10 @@ public class InvariantDeviceProfile { iconTextSize = displayOption.iconTextSize; fillResIconDpi = getLauncherIconDensity(iconBitmapSize); + minCellHeight = displayOption.minCellHeight; + minCellWidth = displayOption.minCellWidth; + borderSpacing = displayOption.borderSpacing; + if (Utilities.isGridOptionsEnabled(context)) { allAppsIconSize = displayOption.allAppsIconSize; allAppsIconTextSize = displayOption.allAppsIconTextSize; @@ -589,6 +610,8 @@ public class InvariantDeviceProfile { private final int defaultLayoutId; private final int demoModeLayoutId; + private final boolean isScalable; + private final SparseArray extraAttrs; public GridOption(Context context, AttributeSet attrs) { @@ -612,6 +635,9 @@ public class InvariantDeviceProfile { numAllAppsColumns = a.getInt( R.styleable.GridDisplayOption_numAllAppsColumns, numColumns); + isScalable = a.getBoolean( + R.styleable.GridDisplayOption_isScalable, false); + a.recycle(); extraAttrs = Themes.createValueMap(context, attrs, @@ -626,6 +652,10 @@ public class InvariantDeviceProfile { private final float minHeightDps; private final boolean canBeDefault; + private float minCellHeight; + private float minCellWidth; + private float borderSpacing; + private float iconSize; private float iconTextSize; private float landscapeIconSize; @@ -643,6 +673,10 @@ public class InvariantDeviceProfile { canBeDefault = a.getBoolean( R.styleable.ProfileDisplayOption_canBeDefault, false); + minCellHeight = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightDps, 0); + minCellWidth = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthDps, 0); + borderSpacing = a.getFloat(R.styleable.ProfileDisplayOption_borderSpacingDps, 0); + iconSize = a.getFloat(R.styleable.ProfileDisplayOption_iconImageSize, 0); landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize, iconSize); @@ -664,6 +698,9 @@ public class InvariantDeviceProfile { minWidthDps = 0; minHeightDps = 0; canBeDefault = false; + minCellHeight = 0; + minCellWidth = 0; + borderSpacing = 0; } private DisplayOption multiply(float w) { @@ -672,6 +709,9 @@ public class InvariantDeviceProfile { allAppsIconSize *= w; iconTextSize *= w; allAppsIconTextSize *= w; + minCellHeight *= w; + minCellWidth *= w; + borderSpacing *= w; return this; } @@ -681,6 +721,9 @@ public class InvariantDeviceProfile { allAppsIconSize += p.allAppsIconSize; iconTextSize += p.iconTextSize; allAppsIconTextSize += p.allAppsIconTextSize; + minCellHeight += p.minCellHeight; + minCellWidth += p.minCellWidth; + borderSpacing += p.borderSpacing; return this; } } diff --git a/src/com/android/launcher3/ResourceUtils.java b/src/com/android/launcher3/ResourceUtils.java index f60e1f8137..ece123dc62 100644 --- a/src/com/android/launcher3/ResourceUtils.java +++ b/src/com/android/launcher3/ResourceUtils.java @@ -60,7 +60,11 @@ public class ResourceUtils { } public static int pxFromDp(float size, DisplayMetrics metrics) { - return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round( - TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics)); + return pxFromDp(size, metrics, 1f); + } + + public static int pxFromDp(float size, DisplayMetrics metrics, float scale) { + return size < 0 ? INVALID_RESOURCE_HANDLE : Math.round(scale + * TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics)); } } diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 504b29e75a..bcb3a54ef3 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -44,6 +44,7 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Pair; +import android.util.TypedValue; import android.view.FocusFinder; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -246,11 +247,16 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo @Override protected void onFinishInflate() { super.onFinishInflate(); + final DeviceProfile dp = mLauncher.getDeviceProfile(); + final int paddingLeftRight = dp.folderContentPaddingLeftRight; + mContent = findViewById(R.id.folder_content); + mContent.setPadding(paddingLeftRight, dp.folderContentPaddingTop, paddingLeftRight, 0); mContent.setFolder(this); mPageIndicator = findViewById(R.id.folder_page_indicator); mFolderName = findViewById(R.id.folder_name); + mFolderName.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp.folderLabelTextSizePx); mFolderName.setOnBackKeyListener(this); mFolderName.setOnFocusChangeListener(this); mFolderName.setOnEditorActionListener(this); @@ -262,12 +268,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mFolderName.forceDisableSuggestions(true); mFooter = findViewById(R.id.folder_footer); - - // We find out how tall footer wants to be (it is set to wrap_content), so that - // we can allocate the appropriate amount of space for it. - int measureSpec = MeasureSpec.UNSPECIFIED; - mFooter.measure(measureSpec, measureSpec); - mFooterHeight = mFooter.getMeasuredHeight(); + mFooterHeight = getResources().getDimensionPixelSize(R.dimen.folder_label_height); if (Utilities.ATLEAST_R) { mFolderWindowInsetsAnimationCallback = diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 1cac31eb18..feb528c96f 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -324,7 +324,9 @@ public class FolderAnimationManager { final int previewPosX = (int) ((mTmpParams.transX - iconOffsetX + previewItemOffsetX) / folderScale); - final int previewPosY = (int) ((mTmpParams.transY + previewItemOffsetY) / folderScale); + final float paddingTop = btv.getPaddingTop() * iconScale; + final int previewPosY = (int) ((mTmpParams.transY + previewItemOffsetY - paddingTop) + / folderScale); final float xDistance = previewPosX - btvLp.x; final float yDistance = previewPosY - btvLp.y; From fd1d75234763030ff9da32ac75502c9a82525642 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Fri, 26 Feb 2021 17:48:42 -0800 Subject: [PATCH 2/7] Check if the recents animation is still running and whether the app being restarted is the live tile app in mLiveTileRestartListener mLiveTileRestartListener is originally used to render the animation to launch the app that's the live tile app (for example, settings is the live tile app and we can launch settings from notification shade). However, we don't want this callback to be triggered when the recents animation is finished / live tile is ended because the default animation in that case won't be skipped. The other scenario that we don't want the animation to be rendered here is when the restarted app is not the live tile app. This can be repro'ed in this scenario - launch any app and go to live tile; launch settings; swipe up from settings; launch the previous live tile app. In this case, we rely on the mLaunchOtherTaskHandler take care of the rendering of this animation. Fixes: 181372992 Test: manual Change-Id: I41b63ce5163f1ac136bf8b5909907a3f84d937d8 --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++- quickstep/src/com/android/quickstep/views/RecentsView.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index feeee502de..808f26e269 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1494,7 +1494,9 @@ public abstract class AbsSwipeUpHandler, Q extends @Override public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task, boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) { - if (mRecentsAnimationTargets.hasTask(task.taskId)) { + if (mRecentsView.getRunningTaskIndex() != -1 + && mRecentsView.getRunningTaskId() == task.taskId + && mRecentsAnimationTargets.hasTask(task.taskId)) { launchOtherTaskInLiveTileMode(task.taskId, mRecentsAnimationTargets.apps); } ActivityManagerWrapper.getInstance().unregisterTaskStackListener( diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index deb1388e96..361c545667 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -1106,6 +1106,10 @@ public abstract class RecentsView extends PagedView } } + public int getRunningTaskId() { + return mRunningTaskId; + } + public @Nullable TaskView getRunningTaskView() { return getTaskView(mRunningTaskId); } From 741fae9ea210354de740120a27b812baf187e7b9 Mon Sep 17 00:00:00 2001 From: Yogisha Dixit Date: Mon, 22 Feb 2021 14:03:44 +0000 Subject: [PATCH 3/7] Move widget files into widget folder + add tests. I will use the newly created LauncherAppWidgetProviderInfoTest in a follow-up CL to add tests for the newly added widget sizing APIs. Test: Automatic: Ran all robolectric tests in launcher3, Manual: Added a widget, edited the widget, removed the widget Bug: 179807199 Change-Id: I540b2dbe284c6eb5aa2466a1d13a9581ee59425b --- .../quickstep/ViewInflationDuringSwipeUp.java | 2 +- .../config/robolectric.properties | 2 +- .../LauncherAppWidgetProviderInfoTest.java | 119 ++++++++++++++++++ .../picker/WidgetsDiffReporterTest.java | 2 +- .../widget/picker/WidgetsListAdapterTest.java | 2 +- ...WidgetsListHeaderViewHolderBinderTest.java | 2 +- .../WidgetsListTableViewHolderBinderTest.java | 2 +- .../model/WidgetsListContentEntryTest.java | 2 +- .../picker/util/WidgetsTableUtilsTest.java | 2 +- .../launcher3/AppWidgetResizeFrame.java | 1 + .../launcher3/AppWidgetsRestoredReceiver.java | 1 + src/com/android/launcher3/Launcher.java | 2 + .../android/launcher3/LauncherProvider.java | 1 + .../launcher3/SecondaryDropTarget.java | 1 + .../launcher3/WidgetPreviewLoader.java | 1 + src/com/android/launcher3/Workspace.java | 3 +- .../allapps/search/LiveSearchManager.java | 2 +- .../launcher3/dragndrop/AddItemActivity.java | 4 +- .../dragndrop/LivePreviewWidgetCell.java | 2 +- .../dragndrop/PinItemDragListener.java | 2 +- .../graphics/LauncherPreviewRenderer.java | 2 +- .../model/GridSizeMigrationTask.java | 2 +- .../model/GridSizeMigrationTaskV2.java | 2 +- .../launcher3/model/ItemInstallQueue.java | 2 +- .../android/launcher3/model/LoaderTask.java | 2 +- .../android/launcher3/model/ModelWriter.java | 2 +- .../android/launcher3/model/WidgetItem.java | 2 +- .../launcher3/touch/ItemClickHandler.java | 2 +- .../{ => widget}/LauncherAppWidgetHost.java | 13 +- .../widget/LauncherAppWidgetHostView.java | 1 - .../LauncherAppWidgetProviderInfo.java | 11 +- .../widget/PendingAddWidgetInfo.java | 1 - .../widget/WidgetAddFlowHandler.java | 1 - .../widget/WidgetHostViewLoader.java | 1 - .../launcher3/widget/WidgetManagerHelper.java | 1 - .../custom/CustomAppWidgetProviderInfo.java | 5 +- .../widget/custom/CustomWidgetManager.java | 4 +- .../widget/picker/WidgetsFullSheet.java | 2 +- .../android/launcher3/model/WidgetsModel.java | 2 +- .../android/launcher3/ui/TestViewHelpers.java | 2 +- .../ui/widget/AddConfigWidgetTest.java | 2 +- .../launcher3/ui/widget/AddWidgetTest.java | 2 +- .../launcher3/ui/widget/BindWidgetTest.java | 2 +- .../android/launcher3/common/WidgetUtils.java | 4 +- 44 files changed, 175 insertions(+), 50 deletions(-) create mode 100644 robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java rename src/com/android/launcher3/{ => widget}/LauncherAppWidgetHost.java (96%) rename src/com/android/launcher3/{ => widget}/LauncherAppWidgetProviderInfo.java (93%) diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java index 72116eb570..4ca1f593c9 100644 --- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java +++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java @@ -49,7 +49,6 @@ import androidx.test.uiautomator.By; import androidx.test.uiautomator.UiDevice; import androidx.test.uiautomator.Until; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.tapl.Background; @@ -58,6 +57,7 @@ import com.android.launcher3.testcomponent.ListViewService.SimpleViewsFactory; import com.android.launcher3.testcomponent.TestCommandReceiver; import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.ui.TestViewHelpers; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.Before; diff --git a/robolectric_tests/config/robolectric.properties b/robolectric_tests/config/robolectric.properties index 4e811f36ff..936ce1240b 100644 --- a/robolectric_tests/config/robolectric.properties +++ b/robolectric_tests/config/robolectric.properties @@ -11,4 +11,4 @@ shadows= \ com.android.launcher3.shadows.ShadowOverrides \ com.android.launcher3.shadows.ShadowSurfaceTransactionApplier \ -application=com.android.launcher3.util.LauncherTestApplication \ No newline at end of file +application=com.android.launcher3.util.LauncherTestApplication diff --git a/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java new file mode 100644 index 0000000000..92f77f2bbd --- /dev/null +++ b/robolectric_tests/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfoTest.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.widget; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.graphics.Point; + +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.InvariantDeviceProfile; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public final class LauncherAppWidgetProviderInfoTest { + + private static final int CELL_SIZE = 50; + + private Context mContext; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + } + + @Test + public void initSpans_minWidthSmallerThanCellWidth_shouldInitializeSpansToOne() { + LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo(); + info.minWidth = 20; + info.minHeight = 20; + InvariantDeviceProfile idp = createIDP(); + + info.initSpans(mContext, idp); + + assertThat(info.spanX).isEqualTo(1); + assertThat(info.spanY).isEqualTo(1); + } + + @Test + public void initSpans_minWidthLargerThanCellWidth_shouldInitializeSpans() { + LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo(); + info.minWidth = 80; + info.minHeight = 80; + InvariantDeviceProfile idp = createIDP(); + + info.initSpans(mContext, idp); + + assertThat(info.spanX).isEqualTo(2); + assertThat(info.spanY).isEqualTo(2); + } + + @Test + public void initSpans_minResizeWidthUnspecified_shouldInitializeMinSpansToOne() { + LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo(); + InvariantDeviceProfile idp = createIDP(); + + info.initSpans(mContext, idp); + + assertThat(info.minSpanX).isEqualTo(1); + assertThat(info.minSpanY).isEqualTo(1); + } + + @Test + public void initSpans_minResizeWidthSmallerThanCellWidth_shouldInitializeMinSpansToOne() { + LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo(); + info.minResizeWidth = 20; + info.minResizeHeight = 20; + InvariantDeviceProfile idp = createIDP(); + + info.initSpans(mContext, idp); + + assertThat(info.minSpanX).isEqualTo(1); + assertThat(info.minSpanY).isEqualTo(1); + } + + @Test + public void initSpans_minResizeWidthLargerThanCellWidth_shouldInitializeMinSpans() { + LauncherAppWidgetProviderInfo info = new LauncherAppWidgetProviderInfo(); + info.minResizeWidth = 80; + info.minResizeHeight = 80; + InvariantDeviceProfile idp = createIDP(); + + info.initSpans(mContext, idp); + + assertThat(info.minSpanX).isEqualTo(2); + assertThat(info.minSpanY).isEqualTo(2); + } + + private InvariantDeviceProfile createIDP() { + DeviceProfile profile = Mockito.mock(DeviceProfile.class); + Mockito.when(profile.getCellSize()).thenReturn(new Point(CELL_SIZE, CELL_SIZE)); + + InvariantDeviceProfile idp = new InvariantDeviceProfile(); + idp.landscapeProfile = idp.portraitProfile = profile; + return idp; + } + +} diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java index 04797a62fb..b972c6ff0e 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsDiffReporterTest.java @@ -32,12 +32,12 @@ import android.os.UserHandle; import androidx.recyclerview.widget.RecyclerView; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.ComponentWithLabel; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.PackageItemInfo; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.widget.model.WidgetsListContentEntry; import com.android.launcher3.widget.model.WidgetsListHeaderEntry; diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java index e94b2532b9..a7c8d92f79 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListAdapterTest.java @@ -31,13 +31,13 @@ import android.view.LayoutInflater; import androidx.recyclerview.widget.RecyclerView; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.ComponentWithLabel; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.PackageItemInfo; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.widget.model.WidgetsListContentEntry; import com.android.launcher3.widget.model.WidgetsListHeaderEntry; diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java index ae5b9a50b7..848630ef5a 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListHeaderViewHolderBinderTest.java @@ -34,7 +34,6 @@ import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.ComponentWithLabel; @@ -42,6 +41,7 @@ import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.PackageItemInfo; import com.android.launcher3.testing.TestActivity; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetCell; import com.android.launcher3.widget.model.WidgetsListHeaderEntry; import com.android.launcher3.widget.picker.WidgetsListHeaderViewHolderBinder.OnHeaderClickListener; diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java index 358e6e02dd..8a0cf349c0 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinderTest.java @@ -37,7 +37,6 @@ import android.widget.TextView; import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.icons.BitmapInfo; @@ -46,6 +45,7 @@ import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.PackageItemInfo; import com.android.launcher3.testing.TestActivity; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetCell; import com.android.launcher3.widget.model.WidgetsListContentEntry; diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java index 86df3f8ab2..2d22c45e2c 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/model/WidgetsListContentEntryTest.java @@ -26,11 +26,11 @@ import android.content.ComponentName; import android.content.Context; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.icons.ComponentWithLabel; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.PackageItemInfo; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.model.WidgetsListContentEntry; import org.junit.Before; diff --git a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java index 5922223f63..e68edd3f3a 100644 --- a/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java +++ b/robolectric_tests/src/com/android/launcher3/widget/picker/util/WidgetsTableUtilsTest.java @@ -30,11 +30,11 @@ import android.graphics.drawable.Drawable; import android.os.UserHandle; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.icons.ComponentWithLabel; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.pm.ShortcutConfigActivityInfo; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.util.WidgetsTableUtils; import org.junit.Before; diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index be92c5d133..20c9ad366c 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -31,6 +31,7 @@ import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.FocusLogic; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.widget.LauncherAppWidgetHostView; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java index b85c648408..75e89b2944 100644 --- a/src/com/android/launcher3/AppWidgetsRestoredReceiver.java +++ b/src/com/android/launcher3/AppWidgetsRestoredReceiver.java @@ -21,6 +21,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.pm.UserCache; import com.android.launcher3.provider.RestoreDbTask; import com.android.launcher3.util.ContentWriter; +import com.android.launcher3.widget.LauncherAppWidgetHost; public class AppWidgetsRestoredReceiver extends BroadcastReceiver { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f7ff262dcd..253a7c7086 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -181,7 +181,9 @@ import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.FloatingSurfaceView; import com.android.launcher3.views.OptionsPopupView; import com.android.launcher3.views.ScrimView; +import com.android.launcher3.widget.LauncherAppWidgetHost; import com.android.launcher3.widget.LauncherAppWidgetHostView; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.PendingAppWidgetHostView; diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index e151777a1e..2ec5e90280 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -71,6 +71,7 @@ import com.android.launcher3.util.IntSet; import com.android.launcher3.util.NoLocaleSQLiteHelper; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.Thunk; +import com.android.launcher3.widget.LauncherAppWidgetHost; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java index 7276887f76..4fd87cbffd 100644 --- a/src/com/android/launcher3/SecondaryDropTarget.java +++ b/src/com/android/launcher3/SecondaryDropTarget.java @@ -46,6 +46,7 @@ import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.Themes; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import java.net.URISyntaxException; diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 2c45c776a1..446c873a1d 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -50,6 +50,7 @@ import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.SQLiteCacheHelper; import com.android.launcher3.util.Thunk; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetCell; import com.android.launcher3.widget.WidgetManagerHelper; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 2528c0305f..aca3d3c3c4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -63,7 +63,6 @@ import android.view.ViewTreeObserver; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Toast; -import com.android.launcher3.LauncherAppWidgetHost.ProviderChangedListener; import com.android.launcher3.accessibility.AccessibleDragListenerAdapter; import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; import com.android.launcher3.anim.Interpolators; @@ -104,6 +103,8 @@ import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.WallpaperOffsetInterpolator; +import com.android.launcher3.widget.LauncherAppWidgetHost; +import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener; import com.android.launcher3.widget.LauncherAppWidgetHostView; import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; diff --git a/src/com/android/launcher3/allapps/search/LiveSearchManager.java b/src/com/android/launcher3/allapps/search/LiveSearchManager.java index 4ef154e6b3..76099a6478 100644 --- a/src/com/android/launcher3/allapps/search/LiveSearchManager.java +++ b/src/com/android/launcher3/allapps/search/LiveSearchManager.java @@ -43,11 +43,11 @@ import androidx.slice.SliceViewManager; import androidx.slice.SliceViewManager.SliceCallback; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherState; import com.android.launcher3.statemanager.StateManager.StateListener; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.SafeCloseable; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; import java.util.ArrayList; diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java index 77d2b85ef9..5dc94ff597 100644 --- a/src/com/android/launcher3/dragndrop/AddItemActivity.java +++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java @@ -47,8 +47,6 @@ import com.android.launcher3.BaseActivity; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetHost; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.model.ItemInstallQueue; @@ -56,6 +54,8 @@ import com.android.launcher3.model.WidgetItem; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.pm.PinRequestHelper; import com.android.launcher3.views.BaseDragLayer; +import com.android.launcher3.widget.LauncherAppWidgetHost; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.WidgetHostViewLoader; diff --git a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java index be6a07f004..fa062f572e 100644 --- a/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java +++ b/src/com/android/launcher3/dragndrop/LivePreviewWidgetCell.java @@ -12,10 +12,10 @@ import android.widget.RemoteViews; import com.android.launcher3.BaseActivity; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.model.WidgetItem; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetCell; /** diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java index 6104d80676..2290473a81 100644 --- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java +++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java @@ -30,8 +30,8 @@ import android.widget.RemoteViews; import com.android.launcher3.DragSource; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.PendingAddItemInfo; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.PendingItemDragHelper; diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 3a9986ee42..5e9b179d6a 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -58,7 +58,6 @@ import com.android.launcher3.Hotseat; import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherSettings; import com.android.launcher3.LauncherSettings.Favorites; @@ -91,6 +90,7 @@ import com.android.launcher3.util.IntArray; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.BaseDragLayer; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.custom.CustomWidgetManager; import java.util.ArrayList; diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java index e8a52bdd54..804e72ee29 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -25,7 +25,6 @@ import androidx.annotation.VisibleForTesting; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.LauncherSettings.Settings; @@ -40,6 +39,7 @@ import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSparseArrayMap; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import java.util.ArrayList; diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java index 79467d36f6..c6c0791a17 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java @@ -39,7 +39,6 @@ import androidx.annotation.VisibleForTesting; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.Utilities; import com.android.launcher3.graphics.LauncherPreviewRenderer; @@ -48,6 +47,7 @@ import com.android.launcher3.pm.InstallSessionHelper; import com.android.launcher3.provider.LauncherDbUtils.SQLiteTransaction; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.IntArray; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import java.util.ArrayList; diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java index d09bf81e17..df8367f256 100644 --- a/src/com/android/launcher3/model/ItemInstallQueue.java +++ b/src/com/android/launcher3/model/ItemInstallQueue.java @@ -42,7 +42,6 @@ import androidx.annotation.WorkerThread; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; @@ -52,6 +51,7 @@ import com.android.launcher3.shortcuts.ShortcutRequest; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.PersistedItemArray; import com.android.launcher3.util.Preconditions; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import java.util.HashSet; import java.util.List; diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 8438622dca..e6e8f270a7 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -50,7 +50,6 @@ import android.util.LongSparseArray; import android.util.TimingLogger; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherSettings; import com.android.launcher3.Utilities; @@ -87,6 +86,7 @@ import com.android.launcher3.util.LooperIdleLock; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.TraceHelper; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import java.util.ArrayList; diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java index f7b43d6bec..312435d175 100644 --- a/src/com/android/launcher3/model/ModelWriter.java +++ b/src/com/android/launcher3/model/ModelWriter.java @@ -28,7 +28,6 @@ import android.os.Looper; import android.util.Log; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetHost; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherSettings; @@ -43,6 +42,7 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.util.ContentWriter; import com.android.launcher3.util.ItemInfoMatcher; +import com.android.launcher3.widget.LauncherAppWidgetHost; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/com/android/launcher3/model/WidgetItem.java b/src/com/android/launcher3/model/WidgetItem.java index de2481a98a..97071bbaad 100644 --- a/src/com/android/launcher3/model/WidgetItem.java +++ b/src/com/android/launcher3/model/WidgetItem.java @@ -4,11 +4,11 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.icons.IconCache; import com.android.launcher3.pm.ShortcutConfigActivityInfo; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; /** * An wrapper over various items displayed in a widget picker, diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java index 098d90d8db..61bd30a6fd 100644 --- a/src/com/android/launcher3/touch/ItemClickHandler.java +++ b/src/com/android/launcher3/touch/ItemClickHandler.java @@ -41,7 +41,6 @@ import android.widget.Toast; import com.android.launcher3.BubbleTextView; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.folder.Folder; @@ -59,6 +58,7 @@ import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.views.FloatingIconView; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAppWidgetHostView; import com.android.launcher3.widget.WidgetAddFlowHandler; import com.android.launcher3.widget.WidgetManagerHelper; diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java similarity index 96% rename from src/com/android/launcher3/LauncherAppWidgetHost.java rename to src/com/android/launcher3/widget/LauncherAppWidgetHost.java index fea26df7da..d745754497 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHost.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetHost.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.widget; import static android.app.Activity.RESULT_CANCELED; @@ -29,12 +29,13 @@ import android.os.Handler; import android.util.SparseArray; import android.widget.Toast; +import com.android.launcher3.BaseActivity; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.R; +import com.android.launcher3.Utilities; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; -import com.android.launcher3.widget.DeferredAppWidgetHostView; -import com.android.launcher3.widget.LauncherAppWidgetHostView; -import com.android.launcher3.widget.PendingAppWidgetHostView; import com.android.launcher3.widget.custom.CustomWidgetManager; import java.util.ArrayList; @@ -199,7 +200,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost { } } - void addPendingView(int appWidgetId, PendingAppWidgetHostView view) { + public void addPendingView(int appWidgetId, PendingAppWidgetHostView view) { mPendingViews.put(appWidgetId, view); } @@ -247,7 +248,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost { super.onProviderChanged(appWidgetId, info); // The super method updates the dimensions of the providerInfo. Update the // launcher spans accordingly. - info.initSpans(mContext); + info.initSpans(mContext, LauncherAppState.getIDP(mContext)); } /** diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java index 41098f9f1c..54e51b2079 100644 --- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java @@ -37,7 +37,6 @@ import android.widget.RemoteViews; import com.android.launcher3.CheckLongPressHelper; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.dragndrop.DragLayer; diff --git a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java similarity index 93% rename from src/com/android/launcher3/LauncherAppWidgetProviderInfo.java rename to src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java index 618b5de79e..b0c85f19eb 100644 --- a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java @@ -1,4 +1,4 @@ -package com.android.launcher3; +package com.android.launcher3.widget; import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetProviderInfo; @@ -11,6 +11,9 @@ import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.UserHandle; +import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.Utilities; import com.android.launcher3.icons.ComponentWithLabelAndIcon; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.data.LauncherAppWidgetInfo; @@ -48,7 +51,7 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo launcherInfo = new LauncherAppWidgetProviderInfo(p); p.recycle(); } - launcherInfo.initSpans(context); + launcherInfo.initSpans(context, LauncherAppState.getIDP(context)); return launcherInfo; } @@ -58,9 +61,7 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo super(in); } - public void initSpans(Context context) { - InvariantDeviceProfile idp = LauncherAppState.getIDP(context); - + public void initSpans(Context context, InvariantDeviceProfile idp) { Point landCellSize = idp.landscapeProfile.getCellSize(); Point portCellSize = idp.portraitProfile.getCellSize(); diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java index bef9a08f14..ee0b84e815 100644 --- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java +++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java @@ -20,7 +20,6 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS import android.appwidget.AppWidgetHostView; import android.os.Bundle; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.PendingAddItemInfo; diff --git a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java index ebc2a25753..1ac5a3328c 100644 --- a/src/com/android/launcher3/widget/WidgetAddFlowHandler.java +++ b/src/com/android/launcher3/widget/WidgetAddFlowHandler.java @@ -21,7 +21,6 @@ import android.os.Parcel; import android.os.Parcelable; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.util.PendingRequestArgs; diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java index 2438bdf5ab..31cbff6982 100644 --- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java +++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java @@ -13,7 +13,6 @@ import android.view.View; import com.android.launcher3.AppWidgetResizeFrame; import com.android.launcher3.DropTarget; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragOptions; diff --git a/src/com/android/launcher3/widget/WidgetManagerHelper.java b/src/com/android/launcher3/widget/WidgetManagerHelper.java index c0c5c48077..680460ffae 100644 --- a/src/com/android/launcher3/widget/WidgetManagerHelper.java +++ b/src/com/android/launcher3/widget/WidgetManagerHelper.java @@ -27,7 +27,6 @@ import android.os.UserHandle; import androidx.annotation.Nullable; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.pm.UserCache; diff --git a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java index 1086987f83..8b3bbce1c5 100644 --- a/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java +++ b/src/com/android/launcher3/widget/custom/CustomAppWidgetProviderInfo.java @@ -22,8 +22,9 @@ import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; -import com.android.launcher3.LauncherAppWidgetProviderInfo; +import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Utilities; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; /** * Custom app widget provider info that can be used as a widget, but provide extra functionality @@ -57,7 +58,7 @@ public class CustomAppWidgetProviderInfo extends LauncherAppWidgetProviderInfo } @Override - public void initSpans(Context context) { } + public void initSpans(Context context, InvariantDeviceProfile idp) { } @Override public String getLabel(PackageManager packageManager) { diff --git a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java index 0b66ec01b6..329a44452b 100644 --- a/src/com/android/launcher3/widget/custom/CustomWidgetManager.java +++ b/src/com/android/launcher3/widget/custom/CustomWidgetManager.java @@ -16,7 +16,7 @@ package com.android.launcher3.widget.custom; -import static com.android.launcher3.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX; +import static com.android.launcher3.widget.LauncherAppWidgetProviderInfo.CLS_CUSTOM_WIDGET_PREFIX; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProviderInfo; @@ -29,12 +29,12 @@ import android.util.SparseArray; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.widget.LauncherAppWidgetHostView; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.systemui.plugins.CustomWidgetPlugin; import com.android.systemui.plugins.PluginListener; diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 3a186c5741..91b79f99c3 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -45,13 +45,13 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetHost.ProviderChangedListener; import com.android.launcher3.R; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.compat.AccessibilityManagerCompat; import com.android.launcher3.views.RecyclerViewFastScroller; import com.android.launcher3.views.TopRoundedCornerView; import com.android.launcher3.widget.BaseWidgetSheet; +import com.android.launcher3.widget.LauncherAppWidgetHost.ProviderChangedListener; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.workprofile.PersonalWorkPagedView; import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener; diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index a7e3472c85..a8c7c4825b 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -17,7 +17,6 @@ import androidx.annotation.Nullable; import com.android.launcher3.AppFilter; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AlphabeticIndexCompat; import com.android.launcher3.config.FeatureFlags; @@ -27,6 +26,7 @@ import com.android.launcher3.model.data.PackageItemInfo; import com.android.launcher3.pm.ShortcutConfigActivityInfo; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.widget.model.WidgetsListContentEntry; diff --git a/tests/src/com/android/launcher3/ui/TestViewHelpers.java b/tests/src/com/android/launcher3/ui/TestViewHelpers.java index eceff346cd..083f58015c 100644 --- a/tests/src/com/android/launcher3/ui/TestViewHelpers.java +++ b/tests/src/com/android/launcher3/ui/TestViewHelpers.java @@ -24,9 +24,9 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.testcomponent.AppWidgetNoConfig; import com.android.launcher3.testcomponent.AppWidgetWithConfig; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import java.util.concurrent.Callable; diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index 737f891d78..b421b0e876 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -28,7 +28,6 @@ import android.view.View; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Workspace; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; @@ -39,6 +38,7 @@ import com.android.launcher3.ui.TestViewHelpers; import com.android.launcher3.util.Wait; import com.android.launcher3.util.Wait.Condition; import com.android.launcher3.util.rule.ShellCommandRule; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import org.junit.Before; import org.junit.Rule; diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java index f146db5947..714b11b18e 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java @@ -23,12 +23,12 @@ import static org.junit.Assert.assertTrue; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.tapl.Widget; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.TestViewHelpers; import com.android.launcher3.util.rule.ShellCommandRule; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import org.junit.Rule; import org.junit.Test; diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index fa495f5a95..9c6c3173ac 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -37,7 +37,6 @@ import android.widget.RemoteViews; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; import com.android.launcher3.model.data.LauncherAppWidgetInfo; @@ -47,6 +46,7 @@ import com.android.launcher3.tapl.Workspace; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.TestViewHelpers; import com.android.launcher3.util.rule.ShellCommandRule; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; import org.junit.After; diff --git a/tests/src_common/com/android/launcher3/common/WidgetUtils.java b/tests/src_common/com/android/launcher3/common/WidgetUtils.java index c0913bf96f..ffad93fffc 100644 --- a/tests/src_common/com/android/launcher3/common/WidgetUtils.java +++ b/tests/src_common/com/android/launcher3/common/WidgetUtils.java @@ -23,12 +23,12 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; -import com.android.launcher3.LauncherAppWidgetHost; -import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.util.ContentWriter; +import com.android.launcher3.widget.LauncherAppWidgetHost; +import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.WidgetManagerHelper; From c7537713ca553728316286e048af304af7cf4989 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Mon, 1 Mar 2021 21:46:25 +0000 Subject: [PATCH 4/7] Add widget description to WidgetCell Full picker: https://screenshot.googleplex.com/8Dij79K8Pq2KWdm.png Bottom picker: https://screenshot.googleplex.com/5f9TLra49dYJjLB.png Test: Manually launch full and bottom widget pickers and observe description is only shown for widgets but not shortcut. Bug: 179797520 Change-Id: I5bfde056906a4a0f4fff9bc9a488f808365173b3 --- res/layout/widget_cell_content.xml | 10 ++++++++ .../android/launcher3/widget/WidgetCell.java | 23 +++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml index c3e37e9176..65a49ab627 100644 --- a/res/layout/widget_cell_content.xml +++ b/res/layout/widget_cell_content.xml @@ -50,4 +50,14 @@ android:textSize="14sp" android:alpha="0.8" /> + + \ No newline at end of file diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index c6593f869e..8c315fd604 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -16,6 +16,8 @@ package com.android.launcher3.widget; +import static com.android.launcher3.Utilities.ATLEAST_S; + import android.content.Context; import android.graphics.Bitmap; import android.os.CancellationSignal; @@ -67,6 +69,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { private WidgetImageView mWidgetImage; private TextView mWidgetName; private TextView mWidgetDims; + private TextView mWidgetDescription; protected WidgetItem mItem; @@ -114,9 +117,10 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { protected void onFinishInflate() { super.onFinishInflate(); - mWidgetImage = (WidgetImageView) findViewById(R.id.widget_preview); - mWidgetName = ((TextView) findViewById(R.id.widget_name)); - mWidgetDims = ((TextView) findViewById(R.id.widget_dims)); + mWidgetImage = findViewById(R.id.widget_preview); + mWidgetName = findViewById(R.id.widget_name); + mWidgetDims = findViewById(R.id.widget_dims); + mWidgetDescription = findViewById(R.id.widget_description); } /** @@ -130,6 +134,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { mWidgetImage.setBitmap(null, null); mWidgetName.setText(null); mWidgetDims.setText(null); + mWidgetDescription.setText(null); + mWidgetDescription.setVisibility(GONE); mPreviewWidth = mPreviewHeight = mPresetPreviewSize; if (mActiveRequest != null) { @@ -145,8 +151,17 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { mItem.spanX, mItem.spanY)); mWidgetDims.setContentDescription(getContext().getString( R.string.widget_accessible_dims_format, mItem.spanX, mItem.spanY)); - mWidgetPreviewLoader = loader; + if (ATLEAST_S && mItem.widgetInfo != null) { + CharSequence description = mItem.widgetInfo.loadDescription(getContext()); + if (description != null && description.length() > 0) { + mWidgetDescription.setText(description); + mWidgetDescription.setVisibility(VISIBLE); + } else { + mWidgetDescription.setVisibility(GONE); + } + } + mWidgetPreviewLoader = loader; if (item.activityInfo != null) { setTag(new PendingAddShortcutInfo(item.activityInfo)); } else { From ca6a539faa8faa672be54f3287be8cb97809cf53 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 24 Feb 2021 14:25:45 -0800 Subject: [PATCH 5/7] Only fetching relevant widget info during first pass This avoids loading resources for allwidget providers when they are not added to homescreen. Test: Verified on device Bug: 180867488 Change-Id: If9adde8eb035ecac75dc4e3e37cd3f0f526865e5 --- src/com/android/launcher3/model/LoaderTask.java | 15 ++++++++------- .../launcher3/widget/WidgetManagerHelper.java | 12 ------------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 8438622dca..2cc1439664 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -45,6 +45,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.Log; import android.util.LongSparseArray; import android.util.TimingLogger; @@ -126,7 +127,7 @@ public class LoaderTask implements Runnable { private final UserManagerState mUserManagerState = new UserManagerState(); - protected Map mWidgetProvidersMap; + protected final Map mWidgetProvidersMap = new ArrayMap<>(); private boolean mStopped; @@ -664,12 +665,13 @@ public class LoaderTask implements Runnable { final boolean wasProviderReady = !c.hasRestoreFlag( LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY); - if (mWidgetProvidersMap == null) { - mWidgetProvidersMap = WidgetManagerHelper.getAllProvidersMap( - context); + ComponentKey providerKey = new ComponentKey(component, c.user); + if (!mWidgetProvidersMap.containsKey(providerKey)) { + mWidgetProvidersMap.put(providerKey, + widgetHelper.findProvider(component, c.user)); } - final AppWidgetProviderInfo provider = mWidgetProvidersMap.get( - new ComponentKey(component, c.user)); + final AppWidgetProviderInfo provider = + mWidgetProvidersMap.get(providerKey); final boolean isProviderReady = isValidProvider(provider); if (!isSafeMode && !customWidget && @@ -873,7 +875,6 @@ public class LoaderTask implements Runnable { mBgDataModel.itemsIdMap.remove(folderId); } } - // Remove any ghost widgets LauncherSettings.Settings.call(contentResolver, LauncherSettings.Settings.METHOD_REMOVE_GHOST_WIDGETS); diff --git a/src/com/android/launcher3/widget/WidgetManagerHelper.java b/src/com/android/launcher3/widget/WidgetManagerHelper.java index c0c5c48077..7248971bce 100644 --- a/src/com/android/launcher3/widget/WidgetManagerHelper.java +++ b/src/com/android/launcher3/widget/WidgetManagerHelper.java @@ -31,14 +31,11 @@ import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.pm.UserCache; -import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.widget.custom.CustomWidgetManager; import java.util.Collections; import java.util.List; -import java.util.Map; -import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -122,15 +119,6 @@ public class WidgetManagerHelper { appWidgetId).getBoolean(WIDGET_OPTION_RESTORE_COMPLETED); } - public static Map getAllProvidersMap(Context context) { - if (WidgetsModel.GO_DISABLE_WIDGETS) { - return Collections.emptyMap(); - } - return allWidgetsSteam(context).collect( - Collectors.toMap(info -> new ComponentKey(info.provider, info.getProfile()), - Function.identity())); - } - private static Stream allWidgetsSteam(Context context) { AppWidgetManager awm = context.getSystemService(AppWidgetManager.class); return Stream.concat( From 2839c20c1ae976a1a90a6dcc2f46a0eba53fde5f Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 2 Mar 2021 12:01:03 -0500 Subject: [PATCH 6/7] Fix NPE in FlingToDeleteHelper Bug: 171543835 Test: not able to repo bug, but this prevents the NPE Change-Id: I153dd0665705b2f5fd7f46786e815ba57dec4720 --- src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java index 7788f9366e..0a1aba12b5 100644 --- a/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java +++ b/src/com/android/launcher3/dragndrop/FlingToDeleteHelper.java @@ -65,6 +65,9 @@ public class FlingToDeleteHelper { } public Runnable getFlingAnimation(DropTarget.DragObject dragObject, DragOptions options) { + if (options == null) { + return null; + } PointF vel = isFlingingToDelete(); options.isFlingToDelete = vel != null; if (!options.isFlingToDelete) { From b96cf5cdf22b22cebfd68efa4a05bfd065cde5a1 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 26 Jan 2021 15:50:23 -0800 Subject: [PATCH 7/7] Fix some issues with TwoButtonNavbarTouchController - Use same swipe height as the tests use to get to Overview - Use mStartState instead of fromState when determining target state, to disallow swiping through states, i.e. from NORMAL to OVERVIEW back to NORMAL in one long swipe up gesture. Instead, now swipe up from NORMAL goes to OVERVIEW and swipe up from OVERVIEW goes to NORMAL. Fixes: 177316094 Change-Id: Ic8e9c8650d4cf11eec344802e3569413bfd5d7bc (cherry picked from commit a24b9ff69d20cdceadca2ad4f206db43f1e2899e) --- .../TwoButtonNavbarTouchController.java | 11 +++++++---- .../touch/AbstractStateChangeTouchController.java | 7 +++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java index 6271a44b53..faf5054007 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java @@ -31,6 +31,7 @@ import com.android.launcher3.states.StateAnimationConfig.AnimationFlags; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SingleAxisSwipeDetector; import com.android.quickstep.SystemUiProxy; +import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.views.AllAppsEduView; /** @@ -92,7 +93,8 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive; return draggingFromNav ? OVERVIEW : NORMAL; } else { - return isDragTowardPositive ^ (fromState == OVERVIEW) ? OVERVIEW : NORMAL; + LauncherState startState = mStartState != null ? mStartState : fromState; + return isDragTowardPositive ^ (startState == OVERVIEW) ? OVERVIEW : NORMAL; } } @@ -106,8 +108,8 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont @Override protected float getShiftRange() { - return mLauncher.getDeviceProfile().isVerticalBarLayout() - ? mLauncher.getDragLayer().getWidth() : super.getShiftRange(); + // Should be in sync with TestProtocol.REQUEST_HOME_TO_OVERVIEW_SWIPE_HEIGHT + return LayoutUtils.getDefaultSwipeHeight(mLauncher, mLauncher.getDeviceProfile()); } @Override @@ -116,7 +118,7 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont long maxAccuracy = (long) (2 * range); mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace(mToState, maxAccuracy, animComponent); - return (mLauncher.getDeviceProfile().isSeascape() ? 2 : -2) / range; + return (mLauncher.getDeviceProfile().isSeascape() ? 1 : -1) / range; } @Override @@ -134,5 +136,6 @@ public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchCont AllAppsEduView.show(mLauncher); } } + mStartState = null; } } diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 65df6144e5..b28d6f7b8f 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -67,8 +67,9 @@ public abstract class AbstractStateChangeTouchController /** * Play an atomic recents animation when the progress from NORMAL to OVERVIEW reaches this. + * TODO: Remove the atomic animation altogether and just go to OVERVIEW directly (b/175137718). */ - public static final float ATOMIC_OVERVIEW_ANIM_THRESHOLD = 0.5f; + public static final float ATOMIC_OVERVIEW_ANIM_THRESHOLD = 1f; protected final long ATOMIC_DURATION = getAtomicDuration(); protected final Launcher mLauncher; @@ -342,9 +343,7 @@ public abstract class AbstractStateChangeTouchController if (!goingBetweenNormalAndOverview(fromState, toState)) { return; } - float threshold = toState == OVERVIEW ? ATOMIC_OVERVIEW_ANIM_THRESHOLD - : 1f - ATOMIC_OVERVIEW_ANIM_THRESHOLD; - boolean passedThreshold = progress >= threshold; + boolean passedThreshold = progress >= ATOMIC_OVERVIEW_ANIM_THRESHOLD; if (passedThreshold != mPassedOverviewAtomicThreshold) { LauncherState atomicFromState = passedThreshold ? fromState: toState; LauncherState atomicToState = passedThreshold ? toState : fromState;