Revert "Revert "Reverting folder cell width on portrait phones.""

am: 6159c242bc

* commit '6159c242bc610f13e4c7550ae8b15f25603f4b23':
  Revert "Revert "Reverting folder cell width on portrait phones.""
This commit is contained in:
Tony Wickham
2015-11-13 18:10:57 +00:00
committed by android-build-merger

View File

@@ -245,7 +245,9 @@ public class DeviceProfile {
hotseatCellHeightPx = iconSizePx;
// Folder
folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
int folderCellPadding = isTablet || isLandscape ? 6 * edgeMarginPx : 3 * edgeMarginPx;
// Don't let the folder get too close to the edges of the screen.
folderCellWidthPx = Math.min(cellWidthPx + folderCellPadding,
(availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
folderCellHeightPx = cellHeightPx + edgeMarginPx;
folderBackgroundOffset = -edgeMarginPx;