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

Commit 9fee3fd3 authored by Alex Chau's avatar Alex Chau
Browse files

Allow column size of search container to be configured 

- Added numSearchContainerColumns in grid-option to control search container's width, defaults to numColumns if not specified

Bug: 210127246
Test: manual
Change-Id: I0c2594f0eeab8844dcff9468e603282a09fae0bd
parent 1ced59ac

res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 


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

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

        <!--  numSearchContainerColumns defaults to numColumns, if not specified -->

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

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

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

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

res/xml/device_profiles.xml

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
        launcher:name="6_by_5"

        launcher:numRows="5"

        launcher:numColumns="6"

        launcher:numSearchContainerColumns="3"

        launcher:numFolderRows="3"

        launcher:numFolderColumns="3"

        launcher:numHotseatIcons="6"

src/com/android/launcher3/DeviceProfile.java

+3 −1
Original line number Diff line number Diff line
@@ -1057,8 +1057,10 @@ public class DeviceProfile { 


        writer.println(prefix + "\tisScalableGrid:" + isScalableGrid);



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

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

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

        writer.println(prefix + "\tinv.numSearchContainerColumns: "

                + inv.numSearchContainerColumns);



        writer.println(prefix + "\tminCellSize: " + inv.minCellSize[mTypeIndex] + "dp");

src/com/android/launcher3/InvariantDeviceProfile.java

+7 −2
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ public class InvariantDeviceProfile { 
     */

    public int numRows;

    public int numColumns;

    public int numSearchContainerColumns;



    /**

     * Number of icons per row and column in the folder.
@@ -300,6 +301,7 @@ public class InvariantDeviceProfile { 
        GridOption closestProfile = displayOption.grid;

        numRows = closestProfile.numRows;

        numColumns = closestProfile.numColumns;

        numSearchContainerColumns = closestProfile.numSearchContainerColumns;

        dbFile = closestProfile.dbFile;

        defaultLayoutId = closestProfile.defaultLayoutId;

        demoModeLayoutId = closestProfile.demoModeLayoutId;
@@ -393,8 +395,8 @@ public class InvariantDeviceProfile { 


    private Object[] toModelState() {

        return new Object[]{

                numColumns, numRows, numDatabaseHotseatIcons, iconBitmapSize, fillResIconDpi,

                numDatabaseAllAppsColumns, dbFile};

                numColumns, numRows, numSearchContainerColumns, numDatabaseHotseatIcons,

                iconBitmapSize, fillResIconDpi, numDatabaseAllAppsColumns, dbFile};

    }



    private void onConfigChanged(Context context) {
@@ -671,6 +673,7 @@ public class InvariantDeviceProfile { 
        public final String name;

        public final int numRows;

        public final int numColumns;

        public final int numSearchContainerColumns;

        public final boolean isEnabled;



        private final int numFolderRows;
@@ -697,6 +700,8 @@ public class InvariantDeviceProfile { 
            name = a.getString(R.styleable.GridDisplayOption_name);

            numRows = a.getInt(R.styleable.GridDisplayOption_numRows, 0);

            numColumns = a.getInt(R.styleable.GridDisplayOption_numColumns, 0);

            numSearchContainerColumns = a.getInt(

                    R.styleable.GridDisplayOption_numSearchContainerColumns, numColumns);



            dbFile = a.getString(R.styleable.GridDisplayOption_dbFile);

            defaultLayoutId = a.getResourceId(deviceType == TYPE_MULTI_DISPLAY && a.hasValue(

src/com/android/launcher3/Workspace.java

+2 −2
Original line number Diff line number Diff line
@@ -585,8 +585,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


        int cellVSpan = FeatureFlags.EXPANDED_SMARTSPACE.get()

                ? EXPANDED_SMARTSPACE_HEIGHT : DEFAULT_SMARTSPACE_HEIGHT;

        CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, firstPage.getCountX(),

                cellVSpan);

        int cellHSpan = mLauncher.getDeviceProfile().inv.numSearchContainerColumns;

        CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, cellHSpan, cellVSpan);

        lp.canReorder = false;

        if (!firstPage.addViewToCellLayout(mQsb, 0, R.id.search_container_workspace, lp, true)) {

            Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");