pa-fazil
/
android_packages_apps_Launcher3
mirror of https://github.com/fazilsheik96/android_packages_apps_Launcher3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev

This commit is contained in:
Sunny Goyal 2023-03-20 20:01:52 +00:00 committed by Android (Google) Code Review
parent 60c419b9b7 7eee74b3f8
commit d2a34a2d54
2 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVER
import static com.android.launcher3.icons.GraphicsUtils.getShapePath; import static com.android.launcher3.icons.GraphicsUtils.getShapePath;
import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE; import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;
import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp; import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp;
import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
@ -377,7 +378,7 @@ public class DeviceProfile {
folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale); folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);
if (inv.folderStyle != INVALID_RESOURCE_HANDLE) { if (isScalableGrid && inv.folderStyle != INVALID_RESOURCE_HANDLE) {
TypedArray folderStyle = context.obtainStyledAttributes(inv.folderStyle, TypedArray folderStyle = context.obtainStyledAttributes(inv.folderStyle,
R.styleable.FolderStyle); R.styleable.FolderStyle);
// These are re-set in #updateFolderCellSize if the grid is not scalable // These are re-set in #updateFolderCellSize if the grid is not scalable
@ -395,7 +396,7 @@ public class DeviceProfile {
folderStyle.recycle(); folderStyle.recycle();
} else { } else {
folderCellLayoutBorderSpacePx = 0; folderCellLayoutBorderSpacePx = 0;
folderFooterHeightPx = 0; folderFooterHeightPx = res.getDimensionPixelSize(R.dimen.folder_footer_height_default);
folderContentPaddingTop = res.getDimensionPixelSize(R.dimen.folder_top_padding_default); folderContentPaddingTop = res.getDimensionPixelSize(R.dimen.folder_top_padding_default);
} }
@ -548,6 +549,9 @@ public class DeviceProfile {
cellLayoutPadding); cellLayoutPadding);
updateWorkspacePadding(); updateWorkspacePadding();
// Folder scaling requires correct workspace paddings
updateAvailableFolderCellDimensions(res);
mMinHotseatIconSpacePx = res.getDimensionPixelSize(R.dimen.min_hotseat_icon_space); mMinHotseatIconSpacePx = res.getDimensionPixelSize(R.dimen.min_hotseat_icon_space);
mMinHotseatQsbWidthPx = res.getDimensionPixelSize(R.dimen.min_hotseat_qsb_width); mMinHotseatQsbWidthPx = res.getDimensionPixelSize(R.dimen.min_hotseat_qsb_width);
mMaxHotseatIconSpacePx = areNavButtonsInline mMaxHotseatIconSpacePx = areNavButtonsInline
@ -875,7 +879,6 @@ public class DeviceProfile {
extraHeight = Math.max(0, maxHeight - getCellLayoutHeightSpecification()); extraHeight = Math.max(0, maxHeight - getCellLayoutHeightSpecification());
} }
updateAvailableFolderCellDimensions(res);
return Math.round(extraHeight); return Math.round(extraHeight);
} }
@ -1064,22 +1067,22 @@ public class DeviceProfile {
private void updateAvailableFolderCellDimensions(Resources res) { private void updateAvailableFolderCellDimensions(Resources res) {
updateFolderCellSize(1f, res); updateFolderCellSize(1f, res);
// Don't let the folder get too close to the edges of the screen. // For usability we can't have the folder use the whole width of the screen
int folderMargin = edgeMarginPx * 2;
Point totalWorkspacePadding = getTotalWorkspacePadding(); Point totalWorkspacePadding = getTotalWorkspacePadding();
// Check if the icons fit within the available height. // Check if the folder fit within the available height.
float contentUsedHeight = folderCellHeightPx * inv.numFolderRows float contentUsedHeight = folderCellHeightPx * inv.numFolderRows
+ ((inv.numFolderRows - 1) * folderCellLayoutBorderSpacePx); + ((inv.numFolderRows - 1) * folderCellLayoutBorderSpacePx)
int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y - folderFooterHeightPx + folderFooterHeightPx
- folderMargin - folderContentPaddingTop; + folderContentPaddingTop;
int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y;
float scaleY = contentMaxHeight / contentUsedHeight; float scaleY = contentMaxHeight / contentUsedHeight;
// Check if the icons fit within the available width. // Check if the folder fit within the available width.
float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns
+ ((inv.numFolderColumns - 1) * folderCellLayoutBorderSpacePx); + ((inv.numFolderColumns - 1) * folderCellLayoutBorderSpacePx)
int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x - folderMargin + folderContentPaddingLeftRight * 2;
- folderContentPaddingLeftRight * 2; int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x;
float scaleX = contentMaxWidth / contentUsedWidth; float scaleX = contentMaxWidth / contentUsedWidth;
float scale = Math.min(scaleX, scaleY); float scale = Math.min(scaleX, scaleY);
@ -1092,17 +1095,25 @@ public class DeviceProfile {
float invIconSizeDp = inv.iconSize[mTypeIndex]; float invIconSizeDp = inv.iconSize[mTypeIndex];
folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale)); folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
folderChildTextSizePx = pxFromSp(inv.iconTextSize[mTypeIndex], mMetrics, scale); folderChildTextSizePx = pxFromSp(inv.iconTextSize[mTypeIndex], mMetrics, scale);
folderLabelTextSizePx = Math.max(pxFromSp(MIN_FOLDER_TEXT_SIZE_SP, mMetrics), folderLabelTextSizePx = Math.max(pxFromSp(MIN_FOLDER_TEXT_SIZE_SP, mMetrics, scale),
(int) (folderChildTextSizePx * folderLabelTextScale)); (int) (folderChildTextSizePx * folderLabelTextScale));
int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx); int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);
if (isScalableGrid) { if (isScalableGrid) {
if (inv.folderStyle == INVALID_RESOURCE_HANDLE) { if (inv.folderStyle == INVALID_RESOURCE_HANDLE) {
folderCellWidthPx = pxFromDp(getCellSize().x, mMetrics, scale); folderCellWidthPx = roundPxValueFromFloat(getCellSize().x * scale);
folderCellHeightPx = pxFromDp(getCellSize().y, mMetrics, scale); folderCellHeightPx = roundPxValueFromFloat(getCellSize().y * scale);
} else {
folderCellWidthPx = roundPxValueFromFloat(folderCellWidthPx * scale);
folderCellHeightPx = roundPxValueFromFloat(folderCellHeightPx * scale);
} }
folderContentPaddingTop = roundPxValueFromFloat(folderContentPaddingTop * scale);
folderCellLayoutBorderSpacePx = roundPxValueFromFloat(
folderCellLayoutBorderSpacePx * scale);
folderFooterHeightPx = roundPxValueFromFloat(folderFooterHeightPx * scale);
folderContentPaddingLeftRight = folderCellLayoutBorderSpacePx; folderContentPaddingLeftRight = folderCellLayoutBorderSpacePx;
} else { } else {
int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding)
@ -1112,10 +1123,14 @@ public class DeviceProfile {
folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX; folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX;
folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight; folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight;
folderContentPaddingTop = roundPxValueFromFloat(folderContentPaddingTop * scale);
folderContentPaddingLeftRight = folderContentPaddingLeftRight =
res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right); res.getDimensionPixelSize(R.dimen.folder_content_padding_left_right);
folderFooterHeightPx = folderFooterHeightPx =
res.getDimensionPixelSize(R.dimen.folder_footer_height_default); roundPxValueFromFloat(
res.getDimensionPixelSize(R.dimen.folder_footer_height_default)
* scale);
} }
folderChildDrawablePaddingPx = Math.max(0, folderChildDrawablePaddingPx = Math.max(0,

68
tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt
View File

@ -342,15 +342,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" + "\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" +
"\tinv.numFolderRows: 4\n" + "\tinv.numFolderRows: 4\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 142.0px (54.095238dp)\n" + "\tfolderCellWidthPx: 173.0px (65.90476dp)\n" +
"\tfolderCellHeightPx: 168.0px (64.0dp)\n" + "\tfolderCellHeightPx: 205.0px (78.09524dp)\n" +
"\tfolderChildIconSizePx: 108.0px (41.142857dp)\n" + "\tfolderChildIconSizePx: 131.0px (49.904762dp)\n" +
"\tfolderChildTextSizePx: 28.0px (10.666667dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 7.0px (2.6666667dp)\n" + "\tfolderChildDrawablePaddingPx: 9.0px (3.4285715dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
"\tfolderTopPadding: 63.0px (24.0dp)\n" + "\tfolderTopPadding: 56.0px (21.333334dp)\n" +
"\tfolderFooterHeight: 147.0px (56.0dp)\n" + "\tfolderFooterHeight: 131.0px (49.904762dp)\n" +
"\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" + "\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" +
"\tbottomSheetOpenDuration: 267\n" + "\tbottomSheetOpenDuration: 267\n" +
"\tbottomSheetCloseDuration: 267\n" + "\tbottomSheetCloseDuration: 267\n" +
@ -474,15 +474,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" + "\ticonDrawablePaddingPx: 0.0px (0.0dp)\n" +
"\tinv.numFolderRows: 4\n" + "\tinv.numFolderRows: 4\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 128.0px (48.761906dp)\n" + "\tfolderCellWidthPx: 163.0px (62.095238dp)\n" +
"\tfolderCellHeightPx: 152.0px (57.904762dp)\n" + "\tfolderCellHeightPx: 192.0px (73.14286dp)\n" +
"\tfolderChildIconSizePx: 98.0px (37.333332dp)\n" + "\tfolderChildIconSizePx: 123.0px (46.857143dp)\n" +
"\tfolderChildTextSizePx: 25.0px (9.523809dp)\n" + "\tfolderChildTextSizePx: 32.0px (12.190476dp)\n" +
"\tfolderChildDrawablePaddingPx: 6.0px (2.2857144dp)\n" + "\tfolderChildDrawablePaddingPx: 8.0px (3.047619dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
"\tfolderTopPadding: 63.0px (24.0dp)\n" + "\tfolderTopPadding: 53.0px (20.190475dp)\n" +
"\tfolderFooterHeight: 147.0px (56.0dp)\n" + "\tfolderFooterHeight: 123.0px (46.857143dp)\n" +
"\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" + "\tbottomSheetTopPadding: 114.0px (43.42857dp)\n" +
"\tbottomSheetOpenDuration: 267\n" + "\tbottomSheetOpenDuration: 267\n" +
"\tbottomSheetCloseDuration: 267\n" + "\tbottomSheetCloseDuration: 267\n" +
@ -607,15 +607,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 397.0px (198.5dp)\n" + "\tfolderCellWidthPx: 240.0px (120.0dp)\n" +
"\tfolderCellHeightPx: 371.0px (185.5dp)\n" + "\tfolderCellHeightPx: 208.0px (104.0dp)\n" +
"\tfolderChildIconSizePx: 99.0px (49.5dp)\n" + "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" +
"\tfolderChildTextSizePx: 23.0px (11.5dp)\n" + "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" +
"\tfolderChildDrawablePaddingPx: 80.0px (40.0dp)\n" + "\tfolderChildDrawablePaddingPx: 16.0px (8.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
"\tfolderTopPadding: 48.0px (24.0dp)\n" + "\tfolderTopPadding: 48.0px (24.0dp)\n" +
"\tfolderFooterHeight: 0.0px (0.0dp)\n" + "\tfolderFooterHeight: 112.0px (56.0dp)\n" +
"\tbottomSheetTopPadding: 104.0px (52.0dp)\n" + "\tbottomSheetTopPadding: 104.0px (52.0dp)\n" +
"\tbottomSheetOpenDuration: 500\n" + "\tbottomSheetOpenDuration: 500\n" +
"\tbottomSheetCloseDuration: 500\n" + "\tbottomSheetCloseDuration: 500\n" +
@ -740,15 +740,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 397.0px (198.5dp)\n" + "\tfolderCellWidthPx: 240.0px (120.0dp)\n" +
"\tfolderCellHeightPx: 371.0px (185.5dp)\n" + "\tfolderCellHeightPx: 208.0px (104.0dp)\n" +
"\tfolderChildIconSizePx: 99.0px (49.5dp)\n" + "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" +
"\tfolderChildTextSizePx: 23.0px (11.5dp)\n" + "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" +
"\tfolderChildDrawablePaddingPx: 80.0px (40.0dp)\n" + "\tfolderChildDrawablePaddingPx: 16.0px (8.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
"\tfolderTopPadding: 48.0px (24.0dp)\n" + "\tfolderTopPadding: 48.0px (24.0dp)\n" +
"\tfolderFooterHeight: 0.0px (0.0dp)\n" + "\tfolderFooterHeight: 112.0px (56.0dp)\n" +
"\tbottomSheetTopPadding: 104.0px (52.0dp)\n" + "\tbottomSheetTopPadding: 104.0px (52.0dp)\n" +
"\tbottomSheetOpenDuration: 500\n" + "\tbottomSheetOpenDuration: 500\n" +
"\tbottomSheetCloseDuration: 500\n" + "\tbottomSheetCloseDuration: 500\n" +
@ -873,15 +873,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 408.0px (204.0dp)\n" + "\tfolderCellWidthPx: 204.0px (102.0dp)\n" +
"\tfolderCellHeightPx: 648.0px (324.0dp)\n" + "\tfolderCellHeightPx: 240.0px (120.0dp)\n" +
"\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" +
"\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" +
"\tfolderChildDrawablePaddingPx: 163.0px (81.5dp)\n" + "\tfolderChildDrawablePaddingPx: 27.0px (13.5dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
"\tfolderTopPadding: 48.0px (24.0dp)\n" + "\tfolderTopPadding: 48.0px (24.0dp)\n" +
"\tfolderFooterHeight: 0.0px (0.0dp)\n" + "\tfolderFooterHeight: 112.0px (56.0dp)\n" +
"\tbottomSheetTopPadding: 704.0px (352.0dp)\n" + "\tbottomSheetTopPadding: 704.0px (352.0dp)\n" +
"\tbottomSheetOpenDuration: 500\n" + "\tbottomSheetOpenDuration: 500\n" +
"\tbottomSheetCloseDuration: 500\n" + "\tbottomSheetCloseDuration: 500\n" +
@ -1006,15 +1006,15 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 408.0px (204.0dp)\n" + "\tfolderCellWidthPx: 204.0px (102.0dp)\n" +
"\tfolderCellHeightPx: 648.0px (324.0dp)\n" + "\tfolderCellHeightPx: 240.0px (120.0dp)\n" +
"\tfolderChildIconSizePx: 120.0px (60.0dp)\n" + "\tfolderChildIconSizePx: 120.0px (60.0dp)\n" +
"\tfolderChildTextSizePx: 28.0px (14.0dp)\n" + "\tfolderChildTextSizePx: 28.0px (14.0dp)\n" +
"\tfolderChildDrawablePaddingPx: 163.0px (81.5dp)\n" + "\tfolderChildDrawablePaddingPx: 27.0px (13.5dp)\n" +
"\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
"\tfolderTopPadding: 48.0px (24.0dp)\n" + "\tfolderTopPadding: 48.0px (24.0dp)\n" +
"\tfolderFooterHeight: 0.0px (0.0dp)\n" + "\tfolderFooterHeight: 112.0px (56.0dp)\n" +
"\tbottomSheetTopPadding: 704.0px (352.0dp)\n" + "\tbottomSheetTopPadding: 704.0px (352.0dp)\n" +
"\tbottomSheetOpenDuration: 500\n" + "\tbottomSheetOpenDuration: 500\n" +
"\tbottomSheetCloseDuration: 500\n" + "\tbottomSheetCloseDuration: 500\n" +