mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-17 09:38:19 +00:00
Merge "Folder polish: unbold folder title, ensure icons not cropped in folder." into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3f062ab8b6
@@ -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"
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user