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

Commit 7c085bf7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-ad7d3769-753e-4ddd-97fb-2d13b2d07948' into ub-launcher3-dorval-polish2 

* changes:
  Factor in CellLayout padding in cell size calculation. am: 8632d9dd
  Factor in CellLayout padding in cell size calculation.
parents 0b5f8f82 d39707b6

src/com/android/launcher3/DeviceProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -436,7 +436,8 @@ public class DeviceProfile { 
        // Since we are only concerned with the overall padding, layout direction does

        // not matter.

        Point padding = getTotalWorkspacePadding();

        result.x = calculateCellWidth(availableWidthPx - padding.x, inv.numColumns);

        int cellPadding = cellLayoutPaddingLeftRightPx * 2;

        result.x = calculateCellWidth(availableWidthPx - padding.x - cellPadding, inv.numColumns);

        result.y = calculateCellHeight(availableHeightPx - padding.y, inv.numRows);

        return result;

    }