Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f1545dd authored by Jon Miranda's avatar Jon Miranda
Browse files

Clean up span calculations in LauncherAppWidgetProviderInfo. 

Using the results from DeviceProfile#getCellSize instead of
manually computing the cell sizes.

Bug: 63850436
Change-Id: I1de3871756a8b0e9bc8c5f9c2c1f386bb8dc31a2
parent 02ed3743

src/com/android/launcher3/LauncherAppWidgetProviderInfo.java

+4 −10
Original line number Diff line number Diff line
@@ -53,19 +53,13 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo { 
    public void initSpans(Context context) {

        InvariantDeviceProfile idp = LauncherAppState.getIDP(context);



        Point paddingLand = idp.landscapeProfile.getTotalWorkspacePadding();

        Point paddingPort = idp.portraitProfile.getTotalWorkspacePadding();

        Point landCellSize = idp.landscapeProfile.getCellSize();

        Point portCellSize = idp.portraitProfile.getCellSize();



        // 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.x,

                idp.portraitProfile.widthPx - paddingPort.x),

                idp.numColumns);

        float smallestCellHeight = DeviceProfile.calculateCellWidth(Math.min(

                idp.landscapeProfile.heightPx - paddingLand.y,

                idp.portraitProfile.heightPx - paddingPort.y),

                idp.numRows);

        float smallestCellWidth = Math.min(landCellSize.x, portCellSize.x);

        float smallestCellHeight = Math.min(landCellSize.y, portCellSize.y);



        // We want to account for the extra amount of padding that we are adding to the widget

        // to ensure that it gets the full amount of space that it has requested.