Merge "Folder polish: unbold folder title, ensure icons not cropped in folder." into sc-dev am: 3f062ab8b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15365040

Change-Id: I0fccfe7fdf32f7bcbcddb3633e34acb1c7c979f6
This commit is contained in:
TreeHugger Robot
2021-07-23 18:23:49 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 3 deletions

View File

@@ -657,8 +657,11 @@ public class DeviceProfile {
int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
if (isScalableGrid) {
folderCellWidthPx = (int) (cellWidthPx * scale);
folderCellHeightPx = (int) (cellHeightPx * scale);
int minWidth = folderChildIconSizePx + iconDrawablePaddingPx * 2;
int minHeight = folderChildIconSizePx + iconDrawablePaddingPx * 2 + textHeight;
folderCellWidthPx = (int) Math.max(minWidth, cellWidthPx * scale);
folderCellHeightPx = (int) Math.max(minHeight, cellHeightPx * scale);
int borderSpacing = (int) (cellLayoutBorderSpacingOriginalPx * scale);
folderCellLayoutBorderSpacingPx = borderSpacing;