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

Commit 2a110069 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I95fda7bdcac71a1757237a11969baf89c7300d33
parents d050a354 3f062ab8

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
@@ -652,8 +652,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;