aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-17 17:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Reduce icon/text simultaneously when cellHeight is not enough for largest display size" into tm-qpr-dev am: bebeefe993

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

Change-Id: Icf11a0438ae9f3e9c00185507d950297b480854c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2023-01-13 03:02:12 +00:00
committed by Automerger Merge Worker
parent 2bc8635b0a bebeefe993
commit 2e9e07fd91
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/DeviceProfile.java
View File

@@ -910,12 +910,24 @@ public class DeviceProfile {
cellHeightPx = cellContentHeight;
cellLayoutBorderSpacePx.y -= extraHeightRequired / numBorders;
} else {
// If it still doesn't fit, set borderSpace to 0 and distribute the space for
// cellHeight, and reduce iconSize.
// If it still doesn't fit, set borderSpace to 0 to recover space.
cellHeightPx = (cellHeightPx * inv.numRows
+ cellLayoutBorderSpacePx.y * numBorders) / inv.numRows;
iconSizePx = Math.min(iconSizePx, cellHeightPx - cellTextAndPaddingHeight);
cellLayoutBorderSpacePx.y = 0;
// Reduce iconDrawablePaddingPx to make cellContentHeight smaller.
int cellContentWithoutPadding = cellContentHeight - iconDrawablePaddingPx;
if (cellContentWithoutPadding <= cellHeightPx) {
iconDrawablePaddingPx = cellContentHeight - cellHeightPx;
} else {
// If it still doesn't fit, set iconDrawablePaddingPx to 0 to recover space,
// then proportional reduce iconSizePx and iconTextSizePx to fit.
iconDrawablePaddingPx = 0;
float ratio = cellHeightPx / (float) cellContentWithoutPadding;
iconSizePx = (int) (iconSizePx * ratio);
iconTextSizePx = (int) (iconTextSizePx * ratio);
}
cellTextAndPaddingHeight =
iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx);
}
cellContentHeight = iconSizePx + cellTextAndPaddingHeight;
}