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

Merge "Make numFolderRows/numFolderColumns accept more values" into main

Browse Source
This commit is contained in:
Thales Lima
2023-11-28 11:22:27 +00:00
committed by Android (Google) Code Review
parent 8f2dc92364 24051842c7
commit 5fc47806f8
4 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values/attrs.xml
+12
View File
@@ -164,7 +164,19 @@
<!-- numFolderRows & numFolderColumns defaults to numRows & numColumns, if not specified -->
<attr name="numFolderRows" format="integer" />
<!-- defaults to numFolderRows, if not specified -->
<attr name="numFolderRowsLandscape" format="integer" />
<!-- defaults to numFolderRows, if not specified -->
<attr name="numFolderRowsTwoPanelLandscape" format="integer" />
<!-- defaults to numFolderRows, if not specified -->
<attr name="numFolderRowsTwoPanelPortrait" format="integer" />
<attr name="numFolderColumns" format="integer" />
<!-- defaults to numFolderColumns, if not specified -->
<attr name="numFolderColumnsLandscape" format="integer" />
<!-- defaults to numFolderColumns, if not specified -->
<attr name="numFolderColumnsTwoPanelLandscape" format="integer" />
<!-- defaults to numFolderColumns, if not specified -->
<attr name="numFolderColumnsTwoPanelPortrait" format="integer" />
<!-- Support attributes in FolderStyle -->
<attr name="folderStyle" format="reference" />
src/com/android/launcher3/DeviceProfile.java
+2 -2
View File
@@ -439,8 +439,8 @@ public class DeviceProfile {
}
folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);
numFolderRows = inv.numFolderRows;
numFolderColumns = inv.numFolderColumns;
numFolderRows = inv.numFolderRows[mTypeIndex];
numFolderColumns = inv.numFolderColumns[mTypeIndex];
if (mIsScalableGrid && inv.folderStyle != INVALID_RESOURCE_HANDLE) {
TypedArray folderStyle = context.obtainStyledAttributes(inv.folderStyle,
src/com/android/launcher3/InvariantDeviceProfile.java
+34 -6
View File
@@ -122,8 +122,8 @@ public class InvariantDeviceProfile {
/**
* Number of icons per row and column in the folder.
*/
public int numFolderRows;
public int numFolderColumns;
public int[] numFolderRows;
public int[] numFolderColumns;
public float[] iconSize;
public float[] iconTextSize;
public int iconBitmapSize;
@@ -810,8 +810,8 @@ public class InvariantDeviceProfile {
public final int numSearchContainerColumns;
public final int deviceCategory;
private final int numFolderRows;
private final int numFolderColumns;
private final int[] numFolderRows = new int[COUNT_SIZES];
private final int[] numFolderColumns = new int[COUNT_SIZES];
private final @StyleRes int folderStyle;
private final @StyleRes int cellStyle;
@@ -888,11 +888,39 @@ public class InvariantDeviceProfile {
a.getResourceId(R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,
R.dimen.taskbar_button_margin_default);
numFolderRows = a.getInt(
numFolderRows[INDEX_DEFAULT] = a.getInt(
R.styleable.GridDisplayOption_numFolderRows, numRows);
numFolderColumns = a.getInt(
numFolderColumns[INDEX_DEFAULT] = a.getInt(
R.styleable.GridDisplayOption_numFolderColumns, numColumns);
if (FeatureFlags.enableResponsiveWorkspace()) {
numFolderRows[INDEX_LANDSCAPE] = a.getInt(
R.styleable.GridDisplayOption_numFolderRowsLandscape,
numFolderRows[INDEX_DEFAULT]);
numFolderColumns[INDEX_LANDSCAPE] = a.getInt(
R.styleable.GridDisplayOption_numFolderColumnsLandscape,
numFolderColumns[INDEX_DEFAULT]);
numFolderRows[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
R.styleable.GridDisplayOption_numFolderRowsTwoPanelPortrait,
numFolderRows[INDEX_DEFAULT]);
numFolderColumns[INDEX_TWO_PANEL_PORTRAIT] = a.getInt(
R.styleable.GridDisplayOption_numFolderColumnsTwoPanelPortrait,
numFolderColumns[INDEX_DEFAULT]);
numFolderRows[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
R.styleable.GridDisplayOption_numFolderRowsTwoPanelLandscape,
numFolderRows[INDEX_DEFAULT]);
numFolderColumns[INDEX_TWO_PANEL_LANDSCAPE] = a.getInt(
R.styleable.GridDisplayOption_numFolderColumnsTwoPanelLandscape,
numFolderColumns[INDEX_DEFAULT]);
} else {
numFolderRows[INDEX_LANDSCAPE] = numFolderRows[INDEX_DEFAULT];
numFolderColumns[INDEX_LANDSCAPE] = numFolderColumns[INDEX_DEFAULT];
numFolderRows[INDEX_TWO_PANEL_PORTRAIT] = numFolderRows[INDEX_DEFAULT];
numFolderColumns[INDEX_TWO_PANEL_PORTRAIT] = numFolderColumns[INDEX_DEFAULT];
numFolderRows[INDEX_TWO_PANEL_LANDSCAPE] = numFolderRows[INDEX_DEFAULT];
numFolderColumns[INDEX_TWO_PANEL_LANDSCAPE] = numFolderColumns[INDEX_DEFAULT];
}
folderStyle = a.getResourceId(R.styleable.GridDisplayOption_folderStyle,
INVALID_RESOURCE_HANDLE);
tests/src/com/android/launcher3/FakeInvariantDeviceProfileTest.kt
+6 -6
View File
@@ -121,8 +121,8 @@ abstract class FakeInvariantDeviceProfileTest {
listOf(PointF(16f, 16f), PointF(16f, 16f), PointF(16f, 16f), PointF(16f, 16f))
.toTypedArray()
numFolderRows = 3
numFolderColumns = 3
numFolderRows = intArrayOf(3, 3, 3, 3)
numFolderColumns = intArrayOf(3, 3, 3, 3)
folderStyle = R.style.FolderStyleDefault
inlineNavButtonsEndSpacing = R.dimen.taskbar_button_margin_split
@@ -204,8 +204,8 @@ abstract class FakeInvariantDeviceProfileTest {
listOf(PointF(16f, 64f), PointF(64f, 16f), PointF(16f, 64f), PointF(16f, 64f))
.toTypedArray()
numFolderRows = 3
numFolderColumns = 3
numFolderRows = intArrayOf(3, 3, 3, 3)
numFolderColumns = intArrayOf(3, 3, 3, 3)
folderStyle = R.style.FolderStyleDefault
inlineNavButtonsEndSpacing = R.dimen.taskbar_button_margin_6_5
@@ -288,8 +288,8 @@ abstract class FakeInvariantDeviceProfileTest {
listOf(PointF(16f, 16f), PointF(16f, 16f), PointF(16f, 20f), PointF(20f, 20f))
.toTypedArray()
numFolderRows = 3
numFolderColumns = 3
numFolderRows = intArrayOf(3, 3, 3, 3)
numFolderColumns = intArrayOf(3, 3, 3, 3)
folderStyle = R.style.FolderStyleDefault
inlineNavButtonsEndSpacing = R.dimen.taskbar_button_margin_split