Adding support for non-zero left insets
Bug: 29613069
Change-Id: Ifdf9bcce7ecdedc510f3be8a4dc10eb8da7c4bf1
diff --git a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
index f245cd3..1a4153f 100644
--- a/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
+++ b/src/com/android/launcher3/LauncherAppWidgetProviderInfo.java
@@ -63,18 +63,18 @@
LauncherAppState app = LauncherAppState.getInstance();
InvariantDeviceProfile idp = app.getInvariantDeviceProfile();
- Rect paddingLand = idp.landscapeProfile.getWorkspacePadding();
- Rect paddingPort = idp.portraitProfile.getWorkspacePadding();
+ Point paddingLand = idp.landscapeProfile.getTotalWorkspacePadding();
+ Point paddingPort = idp.portraitProfile.getTotalWorkspacePadding();
// Always assume we're working with the smallest span to make sure we
// reserve enough space in both orientations.
float smallestCellWidth = DeviceProfile.calculateCellWidth(Math.min(
- idp.landscapeProfile.widthPx - paddingLand.left - paddingLand.right,
- idp.portraitProfile.widthPx - paddingPort.left - paddingPort.right),
+ idp.landscapeProfile.widthPx - paddingLand.x,
+ idp.portraitProfile.widthPx - paddingPort.x),
idp.numColumns);
float smallestCellHeight = DeviceProfile.calculateCellWidth(Math.min(
- idp.landscapeProfile.heightPx - paddingLand.top - paddingLand.bottom,
- idp.portraitProfile.heightPx - paddingPort.top - paddingPort.bottom),
+ idp.landscapeProfile.heightPx - paddingLand.y,
+ idp.portraitProfile.heightPx - paddingPort.y),
idp.numRows);
// We want to account for the extra amount of padding that we are adding to the widget