Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1faa4edc authored by Thales Lima's avatar Thales Lima
Browse files

Make numFolderRows/Columns accept more values 

InvariantDeviceProfile hold values that are not related to current DP in use. Now other classes get the value correctly from DeviceProfile, and each posture can hold different values, making it akin to iconSize.

Fix: 309800141
Test: DeviceProfileResponsiveDumpTest
Test: DeviceProfileResponsiveAlternativeDisplaysDumpTest
Test: DeviceProfileDumpTest
Test: DeviceProfileAlternativeDisplaysDumpTest
Flag: ACONFIG com.android.launcher3.enable_responsive_workspace TEAMFOOD
Change-Id: I32295738585de67205dcd6c8942d08a3d07d169a
parent d60f56c3

res/values/attrs.xml

+12 −0
Original line number Original line Diff line number Diff line
@@ -164,7 +164,19 @@ 




        <!-- numFolderRows & numFolderColumns defaults to numRows & numColumns, if not specified -->

        <!-- numFolderRows & numFolderColumns defaults to numRows & numColumns, if not specified -->

        <attr name="numFolderRows" format="integer" />

        <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" />

        <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 -->

        <!-- Support attributes in FolderStyle -->

        <attr name="folderStyle" format="reference" />

        <attr name="folderStyle" format="reference" />

src/com/android/launcher3/DeviceProfile.java

+12 −8
Original line number Original line Diff line number Diff line
@@ -182,6 +182,8 @@ public class DeviceProfile { 
    public int cellYPaddingPx = -1;

    public int cellYPaddingPx = -1;





    // Folder

    // Folder

    public final int numFolderRows;

    public final int numFolderColumns;

    public final float folderLabelTextScale;

    public final float folderLabelTextScale;

    public int folderLabelTextSizePx;

    public int folderLabelTextSizePx;

    public int folderFooterHeightPx;

    public int folderFooterHeightPx;
@@ -439,6 +441,8 @@ public class DeviceProfile { 
        }

        }





        folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);

        folderLabelTextScale = res.getFloat(R.dimen.folder_label_text_scale);

        numFolderRows = inv.numFolderRows[mTypeIndex];

        numFolderColumns = inv.numFolderColumns[mTypeIndex];





        if (mIsScalableGrid && inv.folderStyle != INVALID_RESOURCE_HANDLE) {

        if (mIsScalableGrid && inv.folderStyle != INVALID_RESOURCE_HANDLE) {

            TypedArray folderStyle = context.obtainStyledAttributes(inv.folderStyle,

            TypedArray folderStyle = context.obtainStyledAttributes(inv.folderStyle,
@@ -645,11 +649,11 @@ public class DeviceProfile { 
                            isTwoPanels ? inv.folderSpecsTwoPanelId : inv.folderSpecsId),

                            isTwoPanels ? inv.folderSpecsTwoPanelId : inv.folderSpecsId),

                    ResponsiveSpecType.Folder);

                    ResponsiveSpecType.Folder);

            mResponsiveFolderWidthSpec = folderSpecs.getCalculatedSpec(responsiveAspectRatio,

            mResponsiveFolderWidthSpec = folderSpecs.getCalculatedSpec(responsiveAspectRatio,

                    DimensionType.WIDTH, inv.numFolderColumns,

                    DimensionType.WIDTH, numFolderColumns,

                    mResponsiveWorkspaceWidthSpec.getAvailableSpace(),

                    mResponsiveWorkspaceWidthSpec.getAvailableSpace(),

                    mResponsiveWorkspaceWidthSpec);

                    mResponsiveWorkspaceWidthSpec);

            mResponsiveFolderHeightSpec = folderSpecs.getCalculatedSpec(responsiveAspectRatio,

            mResponsiveFolderHeightSpec = folderSpecs.getCalculatedSpec(responsiveAspectRatio,

                    DimensionType.HEIGHT, inv.numFolderRows,

                    DimensionType.HEIGHT, numFolderRows,

                    mResponsiveWorkspaceHeightSpec.getAvailableSpace(),

                    mResponsiveWorkspaceHeightSpec.getAvailableSpace(),

                    mResponsiveWorkspaceHeightSpec);

                    mResponsiveWorkspaceHeightSpec);
@@ -1406,16 +1410,16 @@ public class DeviceProfile { 
        Point totalWorkspacePadding = getTotalWorkspacePadding();

        Point totalWorkspacePadding = getTotalWorkspacePadding();





        // Check if the folder fit within the available height.

        // Check if the folder fit within the available height.

        float contentUsedHeight = folderCellHeightPx * inv.numFolderRows

        float contentUsedHeight = folderCellHeightPx * numFolderRows

                + ((inv.numFolderRows - 1) * folderCellLayoutBorderSpacePx.y)

                + ((numFolderRows - 1) * folderCellLayoutBorderSpacePx.y)

                + folderFooterHeightPx

                + folderFooterHeightPx

                + folderContentPaddingTop;

                + folderContentPaddingTop;

        int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y;

        int contentMaxHeight = availableHeightPx - totalWorkspacePadding.y;

        float scaleY = contentMaxHeight / contentUsedHeight;

        float scaleY = contentMaxHeight / contentUsedHeight;





        // Check if the folder fit within the available width.

        // Check if the folder fit within the available width.

        float contentUsedWidth = folderCellWidthPx * inv.numFolderColumns

        float contentUsedWidth = folderCellWidthPx * numFolderColumns

                + ((inv.numFolderColumns - 1) * folderCellLayoutBorderSpacePx.x)

                + ((numFolderColumns - 1) * folderCellLayoutBorderSpacePx.x)

                + folderContentPaddingLeftRight * 2;

                + folderContentPaddingLeftRight * 2;

        int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x;

        int contentMaxWidth = availableWidthPx - totalWorkspacePadding.x;

        float scaleX = contentMaxWidth / contentUsedWidth;

        float scaleX = contentMaxWidth / contentUsedWidth;
@@ -2045,8 +2049,8 @@ public class DeviceProfile { 
        writer.println(prefix + pxToDpStr("iconTextSizePx", iconTextSizePx));

        writer.println(prefix + pxToDpStr("iconTextSizePx", iconTextSizePx));

        writer.println(prefix + pxToDpStr("iconDrawablePaddingPx", iconDrawablePaddingPx));

        writer.println(prefix + pxToDpStr("iconDrawablePaddingPx", iconDrawablePaddingPx));





        writer.println(prefix + "\tinv.numFolderRows: " + inv.numFolderRows);

        writer.println(prefix + "\tnumFolderRows: " + numFolderRows);

        writer.println(prefix + "\tinv.numFolderColumns: " + inv.numFolderColumns);

        writer.println(prefix + "\tnumFolderColumns: " + numFolderColumns);

        writer.println(prefix + pxToDpStr("folderCellWidthPx", folderCellWidthPx));

        writer.println(prefix + pxToDpStr("folderCellWidthPx", folderCellWidthPx));

        writer.println(prefix + pxToDpStr("folderCellHeightPx", folderCellHeightPx));

        writer.println(prefix + pxToDpStr("folderCellHeightPx", folderCellHeightPx));

        writer.println(prefix + pxToDpStr("folderChildIconSizePx", folderChildIconSizePx));

        writer.println(prefix + pxToDpStr("folderChildIconSizePx", folderChildIconSizePx));

src/com/android/launcher3/InvariantDeviceProfile.java

+34 −6
Original line number Original line Diff line number Diff line
@@ -122,8 +122,8 @@ public class InvariantDeviceProfile { 
    /**

    /**

     * Number of icons per row and column in the folder.

     * Number of icons per row and column in the folder.

     */

     */

    public int numFolderRows;

    public int[] numFolderRows;

    public int numFolderColumns;

    public int[] numFolderColumns;

    public float[] iconSize;

    public float[] iconSize;

    public float[] iconTextSize;

    public float[] iconTextSize;

    public int iconBitmapSize;

    public int iconBitmapSize;
@@ -810,8 +810,8 @@ public class InvariantDeviceProfile { 
        public final int numSearchContainerColumns;

        public final int numSearchContainerColumns;

        public final int deviceCategory;

        public final int deviceCategory;





        private final int numFolderRows;

        private final int[] numFolderRows = new int[COUNT_SIZES];

        private final int numFolderColumns;

        private final int[] numFolderColumns = new int[COUNT_SIZES];

        private final @StyleRes int folderStyle;

        private final @StyleRes int folderStyle;

        private final @StyleRes int cellStyle;

        private final @StyleRes int cellStyle;
@@ -888,11 +888,39 @@ public class InvariantDeviceProfile { 
                    a.getResourceId(R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,

                    a.getResourceId(R.styleable.GridDisplayOption_inlineNavButtonsEndSpacing,

                            R.dimen.taskbar_button_margin_default);

                            R.dimen.taskbar_button_margin_default);





            numFolderRows = a.getInt(

            numFolderRows[INDEX_DEFAULT] = a.getInt(

                    R.styleable.GridDisplayOption_numFolderRows, numRows);

                    R.styleable.GridDisplayOption_numFolderRows, numRows);

            numFolderColumns = a.getInt(

            numFolderColumns[INDEX_DEFAULT] = a.getInt(

                    R.styleable.GridDisplayOption_numFolderColumns, numColumns);

                    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,

            folderStyle = a.getResourceId(R.styleable.GridDisplayOption_folderStyle,

                    INVALID_RESOURCE_HANDLE);

                    INVALID_RESOURCE_HANDLE);

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -791,7 +791,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
        if (info.container >= 0) {

        if (info.container >= 0) {

            View folderIcon = getWorkspace().getHomescreenIconByItemId(info.container);

            View folderIcon = getWorkspace().getHomescreenIconByItemId(info.container);

            if (folderIcon instanceof FolderIcon && folderIcon.getTag() instanceof FolderInfo) {

            if (folderIcon instanceof FolderIcon && folderIcon.getTag() instanceof FolderInfo) {

                if (new FolderGridOrganizer(getDeviceProfile().inv)

                if (new FolderGridOrganizer(getDeviceProfile())

                        .setFolderInfo((FolderInfo) folderIcon.getTag())

                        .setFolderInfo((FolderInfo) folderIcon.getTag())

                        .isItemInPreview(info.rank)) {

                        .isItemInPreview(info.rank)) {

                    folderIcon.invalidate();

                    folderIcon.invalidate();

src/com/android/launcher3/ModelCallbacks.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { 
        // Cache one page worth of icons

        // Cache one page worth of icons

        launcher.viewCache.setCacheSize(

        launcher.viewCache.setCacheSize(

            R.layout.folder_application,

            R.layout.folder_application,

            deviceProfile.inv.numFolderColumns * deviceProfile.inv.numFolderRows

            deviceProfile.numFolderColumns * deviceProfile.numFolderRows

        )

        )

        launcher.viewCache.setCacheSize(R.layout.folder_page, 2)

        launcher.viewCache.setCacheSize(R.layout.folder_page, 2)

        TraceHelper.INSTANCE.endSection()

        TraceHelper.INSTANCE.endSection()