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

Commit f33f5b3f authored by Jon Miranda's avatar Jon Miranda
Browse files

Folder polish: unbold folder title, ensure icons not cropped in folder. 

- Ensure folder items are scaled to fit within the height/width in 4x5 mode.
- This bug surfaced now since  we increased the icon size.

Bug: 194356039
Test: set display to large, set font to large
Change-Id: Ie360ca67c3c91649a471bce920b2fc6a82fb9661
parent d2182b24

res/layout/user_folder_icon_normalized.xml

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
            style="@style/TextHeadline"

            android:layout_weight="1"

            android:background="@android:color/transparent"

            android:textStyle="bold"

            android:gravity="center_horizontal"

            android:hint="@string/folder_hint_text"

            android:imeOptions="flagNoExtractUi"

src/com/android/launcher3/DeviceProfile.java

+5 −2
Original line number Diff line number Diff line
@@ -649,8 +649,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;