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

Commit 12fae110 authored by Jordan Silva's avatar Jordan Silva
Browse files

Decrease icon size by steps for folders 

Resize the icon so that it fits within the cell. This will stop the icon from being cut off if it is larger than the cell.

Fix: 288075868
Test: DeviceProfileAlternativeDisplaysDumpTest
Test: DeviceProfileResponsiveAlternativeDisplaysDumpTest
Flag: ENABLE_RESPONSIVE_WORKSPACE
Change-Id: I67c703d89bb7f54a457793490b8251584363dedc
parent e2e1b79b

src/com/android/launcher3/DeviceProfile.java

+29 −2
Original line number Diff line number Diff line
@@ -1258,6 +1258,32 @@ public class DeviceProfile { 
                    mResponsiveHeightSpec.getGutterPx());



            folderContentPaddingLeftRight = mResponsiveFolderWidthSpec.getStartPaddingPx();



            // Reduce icon width if it's wider than the expected folder cell width

            if (folderCellWidthPx < folderChildIconSizePx) {

                folderChildIconSizePx = mIconSizeSteps.getIconSmallerThan(folderCellWidthPx);

            }



            // Recalculating padding and cell height

            folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);

            int folderCellContentHeight = folderChildIconSizePx + folderChildDrawablePaddingPx

                    + textHeight;



            // Reduce the icon in height when it's taller than the expected cell height

            while (folderChildIconSizePx > mIconSizeSteps.minimumIconSize()

                    && folderCellContentHeight > folderCellHeightPx) {

                folderChildDrawablePaddingPx -= folderCellContentHeight - folderCellHeightPx;

                if (folderChildDrawablePaddingPx < 0) {

                    // get a smaller icon size

                    folderChildIconSizePx = mIconSizeSteps.getNextLowerIconSize(

                            folderChildIconSizePx);

                    folderChildDrawablePaddingPx =

                            getNormalizedFolderChildDrawablePaddingPx(textHeight);

                }

                // calculate new cellContentHeight

                folderCellContentHeight = folderChildIconSizePx + folderChildDrawablePaddingPx

                        + textHeight;

            }

        } else if (mIsScalableGrid) {

            if (inv.folderStyle == INVALID_RESOURCE_HANDLE) {

                folderCellWidthPx = roundPxValueFromFloat(getCellSize().x * scale);
@@ -1275,6 +1301,8 @@ public class DeviceProfile { 
            folderFooterHeightPx = roundPxValueFromFloat(folderFooterHeightPx * scale);



            folderContentPaddingLeftRight = folderCellLayoutBorderSpacePx.x;



            folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);

        } else {

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

                    * scale);
@@ -1291,10 +1319,9 @@ public class DeviceProfile { 
                            res.getDimensionPixelSize(R.dimen.folder_footer_height_default)

                                    * scale);



        }



            folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);

        }

    }



    public void updateInsets(Rect insets) {

        mInsets.set(insets);