PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Decrease the padding between app icon and label" into udc-qpr-dev

Browse Source
This commit is contained in:
Alex Chau
2023-06-28 19:51:44 +00:00
committed by Android (Google) Code Review
parent a7a27fd4ca 93ee8fcb30
commit f63ceebadd
2 changed files with 88 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+36 -23
View File
@@ -164,7 +164,7 @@ public class DeviceProfile {
public int iconSizePx; public int iconSizePx;
public int iconTextSizePx; public int iconTextSizePx;
public int iconDrawablePaddingPx; public int iconDrawablePaddingPx;
public int iconDrawablePaddingOriginalPx; private final int mIconDrawablePaddingOriginalPx;
public boolean iconCenterVertically; public boolean iconCenterVertically;
public float cellScaleToFit; public float cellScaleToFit;
@@ -456,7 +456,7 @@ public class DeviceProfile {
cellStyle = context.obtainStyledAttributes(R.style.CellStyleDefault, cellStyle = context.obtainStyledAttributes(R.style.CellStyleDefault,
R.styleable.CellStyle); R.styleable.CellStyle);
} }
iconDrawablePaddingOriginalPx = cellStyle.getDimensionPixelSize( mIconDrawablePaddingOriginalPx = cellStyle.getDimensionPixelSize(
R.styleable.CellStyle_iconDrawablePadding, 0); R.styleable.CellStyle_iconDrawablePadding, 0);
cellStyle.recycle(); cellStyle.recycle();
@@ -883,7 +883,6 @@ public class DeviceProfile {
iconCenterVertically = mIsScalableGrid || mIsResponsiveGrid; iconCenterVertically = mIsScalableGrid || mIsResponsiveGrid;
updateIconSize(1f, res); updateIconSize(1f, res);
updateWorkspacePadding(); updateWorkspacePadding();
// Check to see if the icons fit within the available height. // Check to see if the icons fit within the available height.
@@ -925,6 +924,25 @@ public class DeviceProfile {
+ cellLayoutPaddingPx.left + cellLayoutPaddingPx.right; + cellLayoutPaddingPx.left + cellLayoutPaddingPx.right;
} }
private int getNormalizedIconDrawablePadding() {
// TODO(b/235886078): workaround needed because of this bug
// Icons are 10% larger on XML than their visual size,
// so remove that extra space to get labels closer to the correct padding
int iconVisibleSizePx = (int) Math.round(ICON_VISIBLE_AREA_FACTOR * iconSizePx);
return Math.max(0, mIconDrawablePaddingOriginalPx - ((iconSizePx - iconVisibleSizePx) / 2));
}
private int getNormalizedFolderChildDrawablePaddingPx(int textHeight) {
// TODO(b/235886078): workaround needed because of this bug
// Icons are 10% larger on XML than their visual size,
// so remove that extra space to get labels closer to the correct padding
int drawablePadding = (folderCellHeightPx - folderChildIconSizePx - textHeight) / 3;
int iconVisibleSizePx = Math.round(ICON_VISIBLE_AREA_FACTOR * folderChildIconSizePx);
int iconSizeDiff = folderChildIconSizePx - iconVisibleSizePx;
return Math.max(0, drawablePadding - iconSizeDiff / 2);
}
/** /**
* Updating the iconSize affects many aspects of the launcher layout, such as: iconSizePx, * Updating the iconSize affects many aspects of the launcher layout, such as: iconSizePx,
* iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants, * iconTextSizePx, iconDrawablePaddingPx, cellWidth/Height, allApps* variants,
@@ -937,43 +955,36 @@ public class DeviceProfile {
// Workspace // Workspace
final boolean isVerticalLayout = isVerticalBarLayout(); final boolean isVerticalLayout = isVerticalBarLayout();
iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * iconScale);
cellLayoutBorderSpacePx = getCellLayoutBorderSpace(inv, scale); cellLayoutBorderSpacePx = getCellLayoutBorderSpace(inv, scale);
int cellTextAndPaddingHeight =
iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx);
if (mIsResponsiveGrid) { if (mIsResponsiveGrid) {
int cellContentHeight = iconSizePx + cellTextAndPaddingHeight;
cellWidthPx = mResponsiveWidthSpec.getCellSizePx(); cellWidthPx = mResponsiveWidthSpec.getCellSizePx();
cellHeightPx = mResponsiveHeightSpec.getCellSizePx(); cellHeightPx = mResponsiveHeightSpec.getCellSizePx();
if (cellWidthPx < iconSizePx) { if (cellWidthPx < iconSizePx) {
// get a smaller icon size // get a smaller icon size
iconSizePx = mIconSizeSteps.getIconSmallerThan(cellWidthPx); iconSizePx = mIconSizeSteps.getIconSmallerThan(cellWidthPx);
// calculate new cellContentHeight
cellContentHeight = iconSizePx + cellTextAndPaddingHeight;
} }
iconDrawablePaddingPx = getNormalizedIconDrawablePadding();
int iconTextHeight = Utilities.calculateTextHeight(iconTextSizePx);
int cellContentHeight = iconSizePx + iconDrawablePaddingPx + iconTextHeight;
while (iconSizePx > mIconSizeSteps.minimumIconSize() while (iconSizePx > mIconSizeSteps.minimumIconSize()
&& cellContentHeight > cellHeightPx) { && cellContentHeight > cellHeightPx) {
int extraHeightRequired = cellContentHeight - cellHeightPx; iconDrawablePaddingPx -= cellContentHeight - cellHeightPx;
int newPadding = iconDrawablePaddingPx - extraHeightRequired; if (iconDrawablePaddingPx < 0) {
if (newPadding >= 0) {
// Responsive uses the padding without scaling
iconDrawablePaddingPx = iconDrawablePaddingOriginalPx = newPadding;
cellTextAndPaddingHeight =
iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx);
} else {
// get a smaller icon size // get a smaller icon size
iconSizePx = mIconSizeSteps.getNextLowerIconSize(iconSizePx); iconSizePx = mIconSizeSteps.getNextLowerIconSize(iconSizePx);
iconDrawablePaddingPx = getNormalizedIconDrawablePadding();
} }
// calculate new cellContentHeight // calculate new cellContentHeight
cellContentHeight = iconSizePx + cellTextAndPaddingHeight; cellContentHeight = iconSizePx + iconDrawablePaddingPx + iconTextHeight;
} }
cellYPaddingPx = Math.max(0, cellHeightPx - cellContentHeight) / 2; cellYPaddingPx = Math.max(0, cellHeightPx - cellContentHeight) / 2;
} else if (mIsScalableGrid) { } else if (mIsScalableGrid) {
iconDrawablePaddingPx = (int) (getNormalizedIconDrawablePadding() * iconScale);
cellWidthPx = pxFromDp(inv.minCellSize[mTypeIndex].x, mMetrics, scale); cellWidthPx = pxFromDp(inv.minCellSize[mTypeIndex].x, mMetrics, scale);
cellHeightPx = pxFromDp(inv.minCellSize[mTypeIndex].y, mMetrics, scale); cellHeightPx = pxFromDp(inv.minCellSize[mTypeIndex].y, mMetrics, scale);
@@ -995,6 +1006,8 @@ public class DeviceProfile {
} }
} }
int cellTextAndPaddingHeight =
iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx);
int cellContentHeight = iconSizePx + cellTextAndPaddingHeight; int cellContentHeight = iconSizePx + cellTextAndPaddingHeight;
if (cellHeightPx < cellContentHeight) { if (cellHeightPx < cellContentHeight) {
// If cellHeight no longer fit iconSize, reduce borderSpace to make cellHeight // If cellHeight no longer fit iconSize, reduce borderSpace to make cellHeight
@@ -1030,6 +1043,7 @@ public class DeviceProfile {
desiredWorkspaceHorizontalMarginPx = desiredWorkspaceHorizontalMarginPx =
(int) (desiredWorkspaceHorizontalMarginOriginalPx * scale); (int) (desiredWorkspaceHorizontalMarginOriginalPx * scale);
} else { } else {
iconDrawablePaddingPx = (int) (getNormalizedIconDrawablePadding() * iconScale);
cellWidthPx = iconSizePx + iconDrawablePaddingPx; cellWidthPx = iconSizePx + iconDrawablePaddingPx;
cellHeightPx = (int) Math.ceil(iconSizePx * ICON_OVERLAP_FACTOR) cellHeightPx = (int) Math.ceil(iconSizePx * ICON_OVERLAP_FACTOR)
+ iconDrawablePaddingPx + iconDrawablePaddingPx
@@ -1103,7 +1117,7 @@ public class DeviceProfile {
if (mIsScalableGrid) { if (mIsScalableGrid) {
allAppsIconSizePx = pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics); allAppsIconSizePx = pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics);
allAppsIconTextSizePx = pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics); allAppsIconTextSizePx = pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics);
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx; allAppsIconDrawablePaddingPx = getNormalizedIconDrawablePadding();
allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale); allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale);
if (allAppsCellWidthPx < allAppsIconSizePx) { if (allAppsCellWidthPx < allAppsIconSizePx) {
@@ -1145,7 +1159,7 @@ public class DeviceProfile {
private void updateAllAppsWithResponsiveMeasures() { private void updateAllAppsWithResponsiveMeasures() {
allAppsIconSizePx = iconSizePx; allAppsIconSizePx = iconSizePx;
allAppsIconTextSizePx = iconTextSizePx; allAppsIconTextSizePx = iconTextSizePx;
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx; allAppsIconDrawablePaddingPx = iconDrawablePaddingPx;
allAppsBorderSpacePx = new Point( allAppsBorderSpacePx = new Point(
mAllAppsResponsiveWidthSpec.getGutterPx(), mAllAppsResponsiveWidthSpec.getGutterPx(),
@@ -1279,8 +1293,7 @@ public class DeviceProfile {
} }
folderChildDrawablePaddingPx = Math.max(0, folderChildDrawablePaddingPx = getNormalizedFolderChildDrawablePaddingPx(textHeight);
(folderCellHeightPx - folderChildIconSizePx - textHeight) / 3);
} }
public void updateInsets(Rect insets) { public void updateInsets(Rect insets) {
tests/src/com/android/launcher3/nonquickstep/DeviceProfileDumpTest.kt
+52 -52
View File
@@ -64,8 +64,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 5\n" + "\tinv.numColumns: 5\n" +
"\tinv.numSearchContainerColumns: 5\n" + "\tinv.numSearchContainerColumns: 5\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 165.0px (62.857143dp)\n" + "\tcellWidthPx: 159.0px (60.57143dp)\n" +
"\tcellHeightPx: 235.0px (89.52381dp)\n" + "\tcellHeightPx: 229.0px (87.2381dp)\n" +
"\tgetCellSize().x: 207.0px (78.85714dp)\n" + "\tgetCellSize().x: 207.0px (78.85714dp)\n" +
"\tgetCellSize().y: 379.0px (144.38095dp)\n" + "\tgetCellSize().y: 379.0px (144.38095dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -76,14 +76,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" + "\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" +
"\ticonSizePx: 147.0px (56.0dp)\n" + "\ticonSizePx: 147.0px (56.0dp)\n" +
"\ticonTextSizePx: 38.0px (14.476191dp)\n" + "\ticonTextSizePx: 38.0px (14.476191dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 12.0px (4.571429dp)\n" +
"\tinv.numFolderRows: 4\n" + "\tinv.numFolderRows: 4\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 195.0px (74.28571dp)\n" + "\tfolderCellWidthPx: 195.0px (74.28571dp)\n" +
"\tfolderCellHeightPx: 230.0px (87.61905dp)\n" + "\tfolderCellHeightPx: 230.0px (87.61905dp)\n" +
"\tfolderChildIconSizePx: 147.0px (56.0dp)\n" + "\tfolderChildIconSizePx: 147.0px (56.0dp)\n" +
"\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" + "\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -139,8 +139,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 203.0px (77.333336dp)\n" + "\tworkspacePadding.bottom: 203.0px (77.333336dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 722.0px (275.0476dp)\n" + "\textraSpace: 752.0px (286.4762dp)\n" +
"\tunscaled extraSpace: 722.0px (275.0476dp)\n" + "\tunscaled extraSpace: 752.0px (286.4762dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +
@@ -201,8 +201,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 5\n" + "\tinv.numColumns: 5\n" +
"\tinv.numSearchContainerColumns: 5\n" + "\tinv.numSearchContainerColumns: 5\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 165.0px (62.857143dp)\n" + "\tcellWidthPx: 159.0px (60.57143dp)\n" +
"\tcellHeightPx: 235.0px (89.52381dp)\n" + "\tcellHeightPx: 229.0px (87.2381dp)\n" +
"\tgetCellSize().x: 207.0px (78.85714dp)\n" + "\tgetCellSize().x: 207.0px (78.85714dp)\n" +
"\tgetCellSize().y: 383.0px (145.90475dp)\n" + "\tgetCellSize().y: 383.0px (145.90475dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -213,14 +213,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" + "\tcellLayoutPaddingPx.bottom: 28.0px (10.666667dp)\n" +
"\ticonSizePx: 147.0px (56.0dp)\n" + "\ticonSizePx: 147.0px (56.0dp)\n" +
"\ticonTextSizePx: 38.0px (14.476191dp)\n" + "\ticonTextSizePx: 38.0px (14.476191dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 12.0px (4.571429dp)\n" +
"\tinv.numFolderRows: 4\n" + "\tinv.numFolderRows: 4\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 195.0px (74.28571dp)\n" + "\tfolderCellWidthPx: 195.0px (74.28571dp)\n" +
"\tfolderCellHeightPx: 230.0px (87.61905dp)\n" + "\tfolderCellHeightPx: 230.0px (87.61905dp)\n" +
"\tfolderChildIconSizePx: 147.0px (56.0dp)\n" + "\tfolderChildIconSizePx: 147.0px (56.0dp)\n" +
"\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" + "\tfolderChildTextSizePx: 38.0px (14.476191dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -276,8 +276,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 245.0px (93.333336dp)\n" + "\tworkspacePadding.bottom: 245.0px (93.333336dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 743.0px (283.0476dp)\n" + "\textraSpace: 773.0px (294.4762dp)\n" +
"\tunscaled extraSpace: 743.0px (283.0476dp)\n" + "\tunscaled extraSpace: 773.0px (294.4762dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +
@@ -338,7 +338,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 5\n" + "\tinv.numColumns: 5\n" +
"\tinv.numSearchContainerColumns: 5\n" + "\tinv.numSearchContainerColumns: 5\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 158.0px (60.190475dp)\n" + "\tcellWidthPx: 152.0px (57.904762dp)\n" +
"\tcellHeightPx: 166.0px (63.238094dp)\n" + "\tcellHeightPx: 166.0px (63.238094dp)\n" +
"\tgetCellSize().x: 368.0px (140.19048dp)\n" + "\tgetCellSize().x: 368.0px (140.19048dp)\n" +
"\tgetCellSize().y: 193.0px (73.52381dp)\n" + "\tgetCellSize().y: 193.0px (73.52381dp)\n" +
@@ -357,7 +357,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tfolderCellHeightPx: 205.0px (78.09524dp)\n" + "\tfolderCellHeightPx: 205.0px (78.09524dp)\n" +
"\tfolderChildIconSizePx: 131.0px (49.904762dp)\n" + "\tfolderChildIconSizePx: 131.0px (49.904762dp)\n" +
"\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 9.0px (3.4285715dp)\n" + "\tfolderChildDrawablePaddingPx: 4.0px (1.5238096dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -475,7 +475,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 5\n" + "\tinv.numColumns: 5\n" +
"\tinv.numSearchContainerColumns: 5\n" + "\tinv.numSearchContainerColumns: 5\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 158.0px (60.190475dp)\n" + "\tcellWidthPx: 152.0px (57.904762dp)\n" +
"\tcellHeightPx: 166.0px (63.238094dp)\n" + "\tcellHeightPx: 166.0px (63.238094dp)\n" +
"\tgetCellSize().x: 393.0px (149.71428dp)\n" + "\tgetCellSize().x: 393.0px (149.71428dp)\n" +
"\tgetCellSize().y: 180.0px (68.57143dp)\n" + "\tgetCellSize().y: 180.0px (68.57143dp)\n" +
@@ -494,7 +494,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tfolderCellHeightPx: 192.0px (73.14286dp)\n" + "\tfolderCellHeightPx: 192.0px (73.14286dp)\n" +
"\tfolderChildIconSizePx: 123.0px (46.857143dp)\n" + "\tfolderChildIconSizePx: 123.0px (46.857143dp)\n" +
"\tfolderChildTextSizePx: 32.0px (12.190476dp)\n" + "\tfolderChildTextSizePx: 32.0px (12.190476dp)\n" +
"\tfolderChildDrawablePaddingPx: 8.0px (3.047619dp)\n" + "\tfolderChildDrawablePaddingPx: 3.0px (1.1428572dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -625,14 +625,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" + "\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" +
"\ticonSizePx: 120.0px (60.0dp)\n" + "\ticonSizePx: 120.0px (60.0dp)\n" +
"\ticonTextSizePx: 28.0px (14.0dp)\n" + "\ticonTextSizePx: 28.0px (14.0dp)\n" +
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 240.0px (120.0dp)\n" + "\tfolderCellWidthPx: 240.0px (120.0dp)\n" +
"\tfolderCellHeightPx: 208.0px (104.0dp)\n" + "\tfolderCellHeightPx: 208.0px (104.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: 16.0px (8.0dp)\n" + "\tfolderChildDrawablePaddingPx: 11.0px (5.5dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
@@ -649,7 +649,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tallAppsCloseDuration: 500\n" + "\tallAppsCloseDuration: 500\n" +
"\tallAppsIconSizePx: 120.0px (60.0dp)\n" + "\tallAppsIconSizePx: 120.0px (60.0dp)\n" +
"\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" +
"\tallAppsIconDrawablePaddingPx: 14.0px (7.0dp)\n" + "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tallAppsCellHeightPx: 284.0px (142.0dp)\n" + "\tallAppsCellHeightPx: 284.0px (142.0dp)\n" +
"\tallAppsCellWidthPx: 252.0px (126.0dp)\n" + "\tallAppsCellWidthPx: 252.0px (126.0dp)\n" +
"\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" + "\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" +
@@ -763,14 +763,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" + "\tcellLayoutPaddingPx.bottom: 59.0px (29.5dp)\n" +
"\ticonSizePx: 120.0px (60.0dp)\n" + "\ticonSizePx: 120.0px (60.0dp)\n" +
"\ticonTextSizePx: 28.0px (14.0dp)\n" + "\ticonTextSizePx: 28.0px (14.0dp)\n" +
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 240.0px (120.0dp)\n" + "\tfolderCellWidthPx: 240.0px (120.0dp)\n" +
"\tfolderCellHeightPx: 208.0px (104.0dp)\n" + "\tfolderCellHeightPx: 208.0px (104.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: 16.0px (8.0dp)\n" + "\tfolderChildDrawablePaddingPx: 11.0px (5.5dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
@@ -787,7 +787,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tallAppsCloseDuration: 500\n" + "\tallAppsCloseDuration: 500\n" +
"\tallAppsIconSizePx: 120.0px (60.0dp)\n" + "\tallAppsIconSizePx: 120.0px (60.0dp)\n" +
"\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" +
"\tallAppsIconDrawablePaddingPx: 14.0px (7.0dp)\n" + "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tallAppsCellHeightPx: 284.0px (142.0dp)\n" + "\tallAppsCellHeightPx: 284.0px (142.0dp)\n" +
"\tallAppsCellWidthPx: 252.0px (126.0dp)\n" + "\tallAppsCellWidthPx: 252.0px (126.0dp)\n" +
"\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" + "\tallAppsBorderSpacePxX: 32.0px (16.0dp)\n" +
@@ -901,14 +901,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" +
"\ticonSizePx: 120.0px (60.0dp)\n" + "\ticonSizePx: 120.0px (60.0dp)\n" +
"\ticonTextSizePx: 28.0px (14.0dp)\n" + "\ticonTextSizePx: 28.0px (14.0dp)\n" +
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 204.0px (102.0dp)\n" + "\tfolderCellWidthPx: 204.0px (102.0dp)\n" +
"\tfolderCellHeightPx: 240.0px (120.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: 27.0px (13.5dp)\n" + "\tfolderChildDrawablePaddingPx: 22.0px (11.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
@@ -925,7 +925,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tallAppsCloseDuration: 500\n" + "\tallAppsCloseDuration: 500\n" +
"\tallAppsIconSizePx: 120.0px (60.0dp)\n" + "\tallAppsIconSizePx: 120.0px (60.0dp)\n" +
"\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" +
"\tallAppsIconDrawablePaddingPx: 14.0px (7.0dp)\n" + "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tallAppsCellHeightPx: 316.0px (158.0dp)\n" + "\tallAppsCellHeightPx: 316.0px (158.0dp)\n" +
"\tallAppsCellWidthPx: 192.0px (96.0dp)\n" + "\tallAppsCellWidthPx: 192.0px (96.0dp)\n" +
"\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" + "\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" +
@@ -1039,14 +1039,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 72.0px (36.0dp)\n" +
"\ticonSizePx: 120.0px (60.0dp)\n" + "\ticonSizePx: 120.0px (60.0dp)\n" +
"\ticonTextSizePx: 28.0px (14.0dp)\n" + "\ticonTextSizePx: 28.0px (14.0dp)\n" +
"\ticonDrawablePaddingPx: 14.0px (7.0dp)\n" + "\ticonDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 3\n" + "\tinv.numFolderColumns: 3\n" +
"\tfolderCellWidthPx: 204.0px (102.0dp)\n" + "\tfolderCellWidthPx: 204.0px (102.0dp)\n" +
"\tfolderCellHeightPx: 240.0px (120.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: 27.0px (13.5dp)\n" + "\tfolderChildDrawablePaddingPx: 22.0px (11.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" + "\tfolderContentPaddingLeftRight: 0.0px (0.0dp)\n" +
@@ -1063,7 +1063,7 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tallAppsCloseDuration: 500\n" + "\tallAppsCloseDuration: 500\n" +
"\tallAppsIconSizePx: 120.0px (60.0dp)\n" + "\tallAppsIconSizePx: 120.0px (60.0dp)\n" +
"\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" + "\tallAppsIconTextSizePx: 28.0px (14.0dp)\n" +
"\tallAppsIconDrawablePaddingPx: 14.0px (7.0dp)\n" + "\tallAppsIconDrawablePaddingPx: 9.0px (4.5dp)\n" +
"\tallAppsCellHeightPx: 316.0px (158.0dp)\n" + "\tallAppsCellHeightPx: 316.0px (158.0dp)\n" +
"\tallAppsCellWidthPx: 192.0px (96.0dp)\n" + "\tallAppsCellWidthPx: 192.0px (96.0dp)\n" +
"\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" + "\tallAppsBorderSpacePxX: 16.0px (8.0dp)\n" +
@@ -1170,8 +1170,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 4\n" + "\tinv.numColumns: 4\n" +
"\tinv.numSearchContainerColumns: 4\n" + "\tinv.numSearchContainerColumns: 4\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 159.0px (60.57143dp)\n" + "\tcellWidthPx: 154.0px (58.666668dp)\n" +
"\tcellHeightPx: 223.0px (84.95238dp)\n" + "\tcellHeightPx: 218.0px (83.04762dp)\n" +
"\tgetCellSize().x: 270.0px (102.85714dp)\n" + "\tgetCellSize().x: 270.0px (102.85714dp)\n" +
"\tgetCellSize().y: 342.0px (130.28572dp)\n" + "\tgetCellSize().y: 342.0px (130.28572dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -1182,14 +1182,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" +
"\ticonSizePx: 141.0px (53.714287dp)\n" + "\ticonSizePx: 141.0px (53.714287dp)\n" +
"\ticonTextSizePx: 34.0px (12.952381dp)\n" + "\ticonTextSizePx: 34.0px (12.952381dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 189.0px (72.0dp)\n" + "\tfolderCellWidthPx: 189.0px (72.0dp)\n" +
"\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" +
"\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" +
"\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -1245,8 +1245,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 478.0px (182.09525dp)\n" + "\textraSpace: 498.0px (189.71428dp)\n" +
"\tunscaled extraSpace: 478.0px (182.09525dp)\n" + "\tunscaled extraSpace: 498.0px (189.71428dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +
@@ -1312,8 +1312,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 4\n" + "\tinv.numColumns: 4\n" +
"\tinv.numSearchContainerColumns: 4\n" + "\tinv.numSearchContainerColumns: 4\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 159.0px (60.57143dp)\n" + "\tcellWidthPx: 154.0px (58.666668dp)\n" +
"\tcellHeightPx: 223.0px (84.95238dp)\n" + "\tcellHeightPx: 218.0px (83.04762dp)\n" +
"\tgetCellSize().x: 270.0px (102.85714dp)\n" + "\tgetCellSize().x: 270.0px (102.85714dp)\n" +
"\tgetCellSize().y: 342.0px (130.28572dp)\n" + "\tgetCellSize().y: 342.0px (130.28572dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -1324,14 +1324,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" +
"\ticonSizePx: 141.0px (53.714287dp)\n" + "\ticonSizePx: 141.0px (53.714287dp)\n" +
"\ticonTextSizePx: 34.0px (12.952381dp)\n" + "\ticonTextSizePx: 34.0px (12.952381dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 189.0px (72.0dp)\n" + "\tfolderCellWidthPx: 189.0px (72.0dp)\n" +
"\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" +
"\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" +
"\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -1387,8 +1387,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 478.0px (182.09525dp)\n" + "\textraSpace: 498.0px (189.71428dp)\n" +
"\tunscaled extraSpace: 478.0px (182.09525dp)\n" + "\tunscaled extraSpace: 498.0px (189.71428dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +
@@ -1454,8 +1454,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 4\n" + "\tinv.numColumns: 4\n" +
"\tinv.numSearchContainerColumns: 4\n" + "\tinv.numSearchContainerColumns: 4\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 159.0px (60.57143dp)\n" + "\tcellWidthPx: 154.0px (58.666668dp)\n" +
"\tcellHeightPx: 223.0px (84.95238dp)\n" + "\tcellHeightPx: 218.0px (83.04762dp)\n" +
"\tgetCellSize().x: 224.0px (85.333336dp)\n" + "\tgetCellSize().x: 224.0px (85.333336dp)\n" +
"\tgetCellSize().y: 430.0px (163.80952dp)\n" + "\tgetCellSize().y: 430.0px (163.80952dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -1466,14 +1466,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" +
"\ticonSizePx: 141.0px (53.714287dp)\n" + "\ticonSizePx: 141.0px (53.714287dp)\n" +
"\ticonTextSizePx: 34.0px (12.952381dp)\n" + "\ticonTextSizePx: 34.0px (12.952381dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 189.0px (72.0dp)\n" + "\tfolderCellWidthPx: 189.0px (72.0dp)\n" +
"\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" +
"\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" +
"\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -1529,8 +1529,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 829.0px (315.8095dp)\n" + "\textraSpace: 849.0px (323.42856dp)\n" +
"\tunscaled extraSpace: 829.0px (315.8095dp)\n" + "\tunscaled extraSpace: 849.0px (323.42856dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +
@@ -1592,8 +1592,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tinv.numColumns: 4\n" + "\tinv.numColumns: 4\n" +
"\tinv.numSearchContainerColumns: 4\n" + "\tinv.numSearchContainerColumns: 4\n" +
"\tminCellSize: PointF(0.0, 0.0)dp\n" + "\tminCellSize: PointF(0.0, 0.0)dp\n" +
"\tcellWidthPx: 159.0px (60.57143dp)\n" + "\tcellWidthPx: 154.0px (58.666668dp)\n" +
"\tcellHeightPx: 223.0px (84.95238dp)\n" + "\tcellHeightPx: 218.0px (83.04762dp)\n" +
"\tgetCellSize().x: 224.0px (85.333336dp)\n" + "\tgetCellSize().x: 224.0px (85.333336dp)\n" +
"\tgetCellSize().y: 430.0px (163.80952dp)\n" + "\tgetCellSize().y: 430.0px (163.80952dp)\n" +
"\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" + "\tcellLayoutBorderSpacePx Horizontal: 0.0px (0.0dp)\n" +
@@ -1604,14 +1604,14 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" + "\tcellLayoutPaddingPx.bottom: 0.0px (0.0dp)\n" +
"\ticonSizePx: 141.0px (53.714287dp)\n" + "\ticonSizePx: 141.0px (53.714287dp)\n" +
"\ticonTextSizePx: 34.0px (12.952381dp)\n" + "\ticonTextSizePx: 34.0px (12.952381dp)\n" +
"\ticonDrawablePaddingPx: 18.0px (6.857143dp)\n" + "\ticonDrawablePaddingPx: 13.0px (4.952381dp)\n" +
"\tinv.numFolderRows: 3\n" + "\tinv.numFolderRows: 3\n" +
"\tinv.numFolderColumns: 4\n" + "\tinv.numFolderColumns: 4\n" +
"\tfolderCellWidthPx: 189.0px (72.0dp)\n" + "\tfolderCellWidthPx: 189.0px (72.0dp)\n" +
"\tfolderCellHeightPx: 219.0px (83.42857dp)\n" + "\tfolderCellHeightPx: 219.0px (83.42857dp)\n" +
"\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" + "\tfolderChildIconSizePx: 141.0px (53.714287dp)\n" +
"\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" + "\tfolderChildTextSizePx: 34.0px (12.952381dp)\n" +
"\tfolderChildDrawablePaddingPx: 10.0px (3.8095238dp)\n" + "\tfolderChildDrawablePaddingPx: 5.0px (1.9047619dp)\n" +
"\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.x: 0.0px (0.0dp)\n" +
"\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" + "\tfolderCellLayoutBorderSpacePx.y: 0.0px (0.0dp)\n" +
"\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" + "\tfolderContentPaddingLeftRight: 21.0px (8.0dp)\n" +
@@ -1667,8 +1667,8 @@ class DeviceProfileDumpTest : AbstractDeviceProfileTest() {
"\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" + "\tworkspacePadding.bottom: 330.0px (125.71429dp)\n" +
"\ticonScale: 1.0px (0.3809524dp)\n" + "\ticonScale: 1.0px (0.3809524dp)\n" +
"\tcellScaleToFit : 1.0px (0.3809524dp)\n" + "\tcellScaleToFit : 1.0px (0.3809524dp)\n" +
"\textraSpace: 829.0px (315.8095dp)\n" + "\textraSpace: 849.0px (323.42856dp)\n" +
"\tunscaled extraSpace: 829.0px (315.8095dp)\n" + "\tunscaled extraSpace: 849.0px (323.42856dp)\n" +
"\tmaxEmptySpace: 0.0px (0.0dp)\n" + "\tmaxEmptySpace: 0.0px (0.0dp)\n" +
"\tworkspaceTopPadding: 0.0px (0.0dp)\n" + "\tworkspaceTopPadding: 0.0px (0.0dp)\n" +
"\tworkspaceBottomPadding: 0.0px (0.0dp)\n" + "\tworkspaceBottomPadding: 0.0px (0.0dp)\n" +