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

Commit 7bb10974 authored by Charlie Anderson's avatar Charlie Anderson
Browse files

fix font-scaling from clipping folder child icons 

Bug: 310850491
Test: verify locally and through screenshot tests
Flag: N/A

Change-Id: Iea7319e82ddffed16903e5112848cf089e5d52f2
parent f9e64bc0

src/com/android/launcher3/DeviceProfile.java

+12 −4
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ public class DeviceProfile { 
        final Resources res = context.getResources();

        mMetrics = res.getDisplayMetrics();



        mIconSizeSteps = mIsResponsiveGrid ? new IconSizeSteps(res) : null;

        mIconSizeSteps = new IconSizeSteps(res);



        // Determine sizes.

        widthPx = windowBounds.bounds.width();
@@ -1482,6 +1482,17 @@ public class DeviceProfile { 
                folderCellWidthPx = roundPxValueFromFloat(folderCellWidthPx * scale);

                folderCellHeightPx = roundPxValueFromFloat(folderCellHeightPx * scale);

            }

            // Recalculating padding and cell height

            folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);



            CellContentDimensions cellContentDimensions = new CellContentDimensions(

                    folderChildIconSizePx,

                    folderChildDrawablePaddingPx,

                    folderChildTextSizePx);

            cellContentDimensions.resizeToFitCellHeight(folderCellHeightPx, mIconSizeSteps);

            folderChildIconSizePx = cellContentDimensions.getIconSizePx();

            folderChildDrawablePaddingPx = cellContentDimensions.getIconDrawablePaddingPx();

            folderChildTextSizePx = cellContentDimensions.getIconTextSizePx();



            folderContentPaddingTop = roundPxValueFromFloat(folderContentPaddingTop * scale);

            folderCellLayoutBorderSpacePx = new Point(
@@ -1489,10 +1500,7 @@ public class DeviceProfile { 
                    roundPxValueFromFloat(folderCellLayoutBorderSpacePx.y * scale)

            );

            folderFooterHeightPx = roundPxValueFromFloat(folderFooterHeightPx * scale);



            folderContentPaddingLeftRight = folderCellLayoutBorderSpacePx.x;



            folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);

        } else {

            int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding)

                    * scale);