From 5de4bb09fa9274a1463d3e98d21a15ee36e42c2c Mon Sep 17 00:00:00 2001 From: x-JOC Date: Fri, 19 Jun 2026 20:51:23 +0300 Subject: [PATCH] feat: Nova-style padding controls (#6872) Adds user-configurable spacing controls (similar to Nova Launcher): - Workspace padding: horizontal & vertical sliders (Home screen > Layout). Horizontal factor is applied to the source margin so cells fill the freed space; vertical factor preserves the dock reservation so the last row never overlaps the hotseat. - Widget padding: slider (Home screen > Widgets), 0% removes the forced padding, up to 200%. - App drawer top padding slider (App drawer > Grid). - Widget resize: respect the overridden resize mode so force/unlimited resize shows handles even for widgets whose provider limits resizing. Co-authored-by: Claude Opus 4.8 --- lawnchair/res/values/config.xml | 4 ++ lawnchair/res/values/strings.xml | 5 +++ .../preferences2/PreferenceManager2.kt | 24 ++++++++++++ .../destinations/AppDrawerPreferences.kt | 9 +++++ .../destinations/HomeScreenPreferences.kt | 27 ++++++++++++++ .../launcher3/AppWidgetResizeFrame.java | 8 +++- src/com/android/launcher3/DeviceProfile.java | 37 +++++++++++++++++++ 7 files changed, 112 insertions(+), 2 deletions(-) diff --git a/lawnchair/res/values/config.xml b/lawnchair/res/values/config.xml index 8787116367..ddcdf9e950 100644 --- a/lawnchair/res/values/config.xml +++ b/lawnchair/res/values/config.xml @@ -174,6 +174,10 @@ 2 1000 1.0 + 1.0 + 1.0 + 1.0 + 1.0 diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index 0f0313edf3..2a75c4c15d 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -687,6 +687,11 @@ Home screen is locked Prevent changes to the home screen layout + Horizontal padding + Vertical padding + Top padding + Widget padding + Set as default page Default home page updated Move page left diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index a8821cf977..aabf1b076b 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -533,6 +533,30 @@ class PreferenceManager2 @Inject constructor( onSet = { reloadHelper.reloadGrid() }, ) + val workspacePaddingHorizontalFactor = preference( + key = floatPreferencesKey(name = "workspace_padding_horizontal"), + defaultValue = resourceProvider.getFloat(R.dimen.config_default_workspace_padding_horizontal), + onSet = { reloadHelper.reloadGrid() }, + ) + + val workspacePaddingVerticalFactor = preference( + key = floatPreferencesKey(name = "workspace_padding_vertical"), + defaultValue = resourceProvider.getFloat(R.dimen.config_default_workspace_padding_vertical), + onSet = { reloadHelper.reloadGrid() }, + ) + + val widgetPaddingFactor = preference( + key = floatPreferencesKey(name = "widget_padding_factor"), + defaultValue = resourceProvider.getFloat(R.dimen.config_default_widget_padding_factor), + onSet = { reloadHelper.reloadGrid() }, + ) + + val drawerPaddingTopFactor = preference( + key = floatPreferencesKey(name = "drawer_padding_top"), + defaultValue = resourceProvider.getFloat(R.dimen.config_default_drawer_padding_top), + onSet = { reloadHelper.reloadGrid() }, + ) + val enableFuzzySearch = preference( key = booleanPreferencesKey(name = "enable_fuzzy_search"), defaultValue = context.resources.getBoolean(R.bool.config_default_enable_fuzzy_search), diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt index e97bfe2970..e91220233a 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt @@ -143,6 +143,15 @@ fun AppDrawerPreferences( showAsPercentage = true, ) } + Item { + SliderPreference( + adapter = prefs2.drawerPaddingTopFactor.getAdapter(), + label = stringResource(id = R.string.top_padding_label), + valueRange = 1.0F..2.0F, + step = 0.05F, + showAsPercentage = true, + ) + } } val showDrawerLabels = prefs2.showIconLabelsInDrawer.getAdapter() PreferenceGroup(heading = stringResource(id = R.string.icons)) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt index 33216649f4..c7d5d76bdb 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt @@ -181,6 +181,24 @@ fun HomeScreenPreferences( subtitle = stringResource(id = R.string.x_by_y, columns, rows), ) } + Item { + SliderPreference( + label = stringResource(id = R.string.horizontal_padding_label), + adapter = prefs2.workspacePaddingHorizontalFactor.getAdapter(), + step = 0.05f, + valueRange = 0F..2F, + showAsPercentage = true, + ) + } + Item { + SliderPreference( + label = stringResource(id = R.string.vertical_padding_label), + adapter = prefs2.workspacePaddingVerticalFactor.getAdapter(), + step = 0.05f, + valueRange = 0F..2F, + showAsPercentage = true, + ) + } Item { SwitchPreference( adapter = lockHomeScreenAdapter, @@ -290,6 +308,15 @@ fun HomeScreenPreferences( description = stringResource(id = R.string.force_widget_resize_description), ) } + Item { + SliderPreference( + label = stringResource(id = R.string.widget_padding_label), + adapter = prefs2.widgetPaddingFactor.getAdapter(), + step = 0.05f, + valueRange = 0F..2F, + showAsPercentage = true, + ) + } } } } diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 4671d2c3ed..29e73e4cc2 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -306,7 +306,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O // on font / display change, the dp/px size of a cell changes, which means, existing spans // may be invalid. User should be able to resize to the correct widget size. boolean isWidgetVSpanInvalid = widgetInfoOnView.spanY < mMinVSpan; - mVerticalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0 && ( + // Lawnchair: use the (possibly overridden) resizeMode so force/unlimited resize can + // show handles even for widgets whose provider declares limited/no resizing. + mVerticalResizeActive = (resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0 && ( (mMinVSpan < idp.numRows && mMaxVSpan > 1 && mMinVSpan < mMaxVSpan) || isWidgetVSpanInvalid); if (!mVerticalResizeActive) { @@ -317,8 +319,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O // on font / display change, the dp/px size of a cell changes, which means, existing spans // may be invalid. User should be able to resize to the correct widget size. boolean isWidgetHSpanInvalid = widgetInfoOnView.spanX < mMinHSpan; + // Lawnchair: use the (possibly overridden) resizeMode so force/unlimited resize can + // show handles even for widgets whose provider declares limited/no resizing. mHorizontalResizeActive = - (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0 && ( + (resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0 && ( (mMinHSpan < idp.numColumns && mMaxHSpan > 1 && mMinHSpan < mMaxHSpan) || isWidgetHSpanInvalid); if (!mHorizontalResizeActive) { diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index e4c9b68f15..b7f36a0049 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -338,6 +338,10 @@ public class DeviceProfile { private final TextFactors mTextFactors; private float allAppsCellHeightMultiplier; + private float workspacePaddingHorizontalFactor; + private float workspacePaddingVerticalFactor; + private float widgetPaddingFactor; + private float drawerPaddingTopFactor; private PreferenceManager2 preferenceManager2 = null; /** TODO: Once we fully migrate to staged split, remove "isMultiWindowMode" */ @@ -353,6 +357,16 @@ public class DeviceProfile { preferenceManager2 = PreferenceManager2.INSTANCE.get(context); allAppsCellHeightMultiplier = PreferenceExtensionsKt .firstBlocking(preferenceManager2.getDrawerCellHeightFactor()); + // Lawnchair: clamp the user padding factors to their slider ranges so a restored or + // manually edited preference can't feed out-of-range values into the layout math. + workspacePaddingHorizontalFactor = Utilities.boundToRange(PreferenceExtensionsKt + .firstBlocking(preferenceManager2.getWorkspacePaddingHorizontalFactor()), 0f, 2f); + workspacePaddingVerticalFactor = Utilities.boundToRange(PreferenceExtensionsKt + .firstBlocking(preferenceManager2.getWorkspacePaddingVerticalFactor()), 0f, 2f); + widgetPaddingFactor = Utilities.boundToRange(PreferenceExtensionsKt + .firstBlocking(preferenceManager2.getWidgetPaddingFactor()), 0f, 2f); + drawerPaddingTopFactor = Utilities.boundToRange(PreferenceExtensionsKt + .firstBlocking(preferenceManager2.getDrawerPaddingTopFactor()), 1f, 2f); this.inv = inv; mDeviceProperties = DeviceProperties.Factory.createDeviceProperties( @@ -636,6 +650,11 @@ public class DeviceProfile { } desiredWorkspaceHorizontalMarginPx = getHorizontalMarginPx(inv, res); + // Lawnchair: scale the horizontal workspace margin at the source so the cell layout + // width calculation uses the scaled value too. Otherwise cells keep their original + // width and get centered, leaving a visible side gap even at factor 0. + desiredWorkspaceHorizontalMarginPx = + Math.round(desiredWorkspaceHorizontalMarginPx * workspacePaddingHorizontalFactor); desiredWorkspaceHorizontalMarginOriginalPx = desiredWorkspaceHorizontalMarginPx; splitPlaceholderInset = res.getDimensionPixelSize(R.dimen.split_placeholder_inset); @@ -684,6 +703,9 @@ public class DeviceProfile { allAppsShiftRange = res.getDimensionPixelSize(R.dimen.all_apps_starting_vertical_translate); } + // Lawnchair: extra user-configurable app drawer top padding. The factor is additive + // and slider-ranged 100%-200% (default 100%), so subtract 1f to keep 100% as no change. + allAppsPadding.top += Math.round(iconSizePx * (drawerPaddingTopFactor - 1f)); allAppsOpenDuration = res.getInteger(R.integer.config_allAppsOpenDuration); allAppsCloseDuration = res.getInteger(R.integer.config_allAppsCloseDuration); @@ -1350,6 +1372,11 @@ public class DeviceProfile { } else { widgetPadding.setEmpty(); } + // Lawnchair: scale widget padding by user factor (0 = remove, 1 = default). + widgetPadding.left = Math.round(widgetPadding.left * widgetPaddingFactor); + widgetPadding.right = Math.round(widgetPadding.right * widgetPaddingFactor); + widgetPadding.top = Math.round(widgetPadding.top * widgetPaddingFactor); + widgetPadding.bottom = Math.round(widgetPadding.bottom * widgetPaddingFactor); } /** @@ -1718,6 +1745,16 @@ public class DeviceProfile { paddingLeft = isSeascape() ? desiredWorkspaceHorizontalMarginPx : 0; paddingRight = isSeascape() ? 0 : desiredWorkspaceHorizontalMarginPx; } + + // Lawnchair: scale vertical workspace padding by user factor. + // (Horizontal is applied at the source margin so the cells fill the freed space.) + // The dock (hotseatBarSizePx) reservation in the bottom padding must be preserved, + // otherwise reducing the factor pulls the last row into the dock and clips it. + paddingTop = Math.round(paddingTop * workspacePaddingVerticalFactor); + int bottomHotseatReserve = Math.min(hotseatBarSizePx, paddingBottom); + paddingBottom = bottomHotseatReserve + + Math.round((paddingBottom - bottomHotseatReserve) * workspacePaddingVerticalFactor); + padding.set(paddingLeft, paddingTop, paddingRight, paddingBottom); } insetPadding(workspacePadding, cellLayoutPaddingPx);