sizes = new ArrayList<>(2);
+ final float density = context.getResources().getDisplayMetrics().density;
+ final Point cellSize = new Point();
+
+ for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {
+ Size widgetSizePx = getWidgetSizePx(profile, spanX, spanY, cellSize);
+ sizes.add(new SizeF(widgetSizePx.getWidth() / density,
+ widgetSizePx.getHeight() / density));
+ }
+ return sizes;
+ }
+
+ /** Returns the size, in pixels, a widget of given spans & {@code profile}. */
+ public static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY) {
+ return getWidgetSizePx(profile, spanX, spanY, /* recycledCellSize= */ null);
+ }
+
+ private static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY,
+ @Nullable Point recycledCellSize) {
+ final int hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
+ final int vBorderSpacing = (spanY - 1) * profile.cellLayoutBorderSpacingPx;
+ if (recycledCellSize == null) {
+ recycledCellSize = new Point();
+ }
+ profile.getCellSize(recycledCellSize);
+ return new Size(((spanX * recycledCellSize.x) + hBorderSpacing),
+ ((spanY * recycledCellSize.y) + vBorderSpacing));
+ }
+
+ /**
+ * Updates a given {@code widgetView} with size, {@code spanX}, {@code spanY}.
+ *
+ * On Android S+, it also updates the given {@code widgetView} with a list of sizes derived
+ * from {@code spanX}, {@code spanY} in all supported device profiles.
+ */
+ @SuppressLint("NewApi") // Already added API check.
+ public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Context context,
+ int spanX, int spanY) {
+ List sizes = getWidgetSizes(context, spanX, spanY);
+ if (ATLEAST_S) {
+ widgetView.updateAppWidgetSize(new Bundle(), sizes);
+ } else {
+ Rect bounds = getMinMaxSizes(sizes);
+ widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,
+ bounds.bottom);
+ }
+ }
+
+ /**
+ * Returns the bundle to be used as the default options for a widget with provided size.
+ */
+ public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,
+ int spanY) {
+ ArrayList sizes = getWidgetSizes(context, spanX, spanY);
+ Rect padding = getDefaultPaddingForWidget(context, provider, null);
+ float density = context.getResources().getDisplayMetrics().density;
+ float xPaddingDips = (padding.left + padding.right) / density;
+ float yPaddingDips = (padding.top + padding.bottom) / density;
+
+ ArrayList paddedSizes = sizes.stream()
+ .map(size -> new SizeF(
+ Math.max(0.f, size.getWidth() - xPaddingDips),
+ Math.max(0.f, size.getHeight() - yPaddingDips)))
+ .collect(Collectors.toCollection(ArrayList::new));
+
+ Rect rect = getMinMaxSizes(paddedSizes);
+ Bundle options = new Bundle();
+ options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, rect.left);
+ options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, rect.top);
+ options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, rect.right);
+ options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, rect.bottom);
+ options.putParcelableArrayList(AppWidgetManager.OPTION_APPWIDGET_SIZES, paddedSizes);
+ return options;
+ }
+
+ /**
+ * Returns the min and max widths and heights given a list of sizes, in dp.
+ *
+ * @param sizes List of sizes to get the min/max from.
+ * @return A rectangle with the left (resp. top) is used for the min width (resp. height) and
+ * the right (resp. bottom) for the max. The returned rectangle is set with 0s if the list is
+ * empty.
+ */
+ private static Rect getMinMaxSizes(List sizes) {
+ if (sizes.isEmpty()) {
+ return new Rect();
+ } else {
+ SizeF first = sizes.get(0);
+ Rect result = new Rect((int) first.getWidth(), (int) first.getHeight(),
+ (int) first.getWidth(), (int) first.getHeight());
+ for (int i = 1; i < sizes.size(); i++) {
+ result.union((int) sizes.get(i).getWidth(), (int) sizes.get(i).getHeight());
+ }
+ return result;
+ }
+ }
+}
diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
index 8f9cdc8a4c..59ada7b518 100644
--- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
+++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java
@@ -126,6 +126,7 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd
@Override
public void setActiveMarker(int activePage) {
updateTabTextColor(activePage);
+ updateIndicatorPosition(activePage);
if (mOnActivePageChangedListener != null && mLastActivePage != activePage) {
mOnActivePageChangedListener.onActivePageChanged(activePage);
}