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

Commit abfe3646 authored by Thales Lima's avatar Thales Lima
Browse files

Implement calculations of Responsive Grid for AllApps 

All Apps follow the same sizes as the workspace, so we copy the measurements to AllApps values.

Bug: 284152932
Test: HomeScreenAllAppsImageTest
Test: DeviceProfileDumpTest
Test: HomeScreenResponsiveAllAppsImageTest
Test: DeviceProfileResponsiveDumpTest
Flag: ENABLE_RESPONSIVE_WORKSPACE
Change-Id: I12743a6ac5ab5f1a8bc911511bdc7e12b2261d86
parent 5ee79af2

res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ 
        <!-- File that contains the specs for the workspace.

        Needs FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE enabled -->

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

        <!-- File that contains the specs for all apps.

        Needs FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE enabled -->

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



        <!-- By default all categories are enabled -->

        <attr name="deviceCategory" format="integer">

src/com/android/launcher3/DeviceProfile.java

+77 −45
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import com.android.launcher3.config.FeatureFlags; 
import com.android.launcher3.icons.DotRenderer;

import com.android.launcher3.icons.IconNormalizer;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.responsive.AllAppsSpecs;

import com.android.launcher3.responsive.CalculatedAllAppsSpec;

import com.android.launcher3.uioverrides.ApiWrapper;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.Info;
@@ -75,7 +77,8 @@ public class DeviceProfile { 


    public static final PointF DEFAULT_SCALE = new PointF(1.0f, 1.0f);

    public static final ViewScaleProvider DEFAULT_PROVIDER = itemInfo -> DEFAULT_SCALE;

    public static final Consumer<DeviceProfile> DEFAULT_DIMENSION_PROVIDER = dp -> {};

    public static final Consumer<DeviceProfile> DEFAULT_DIMENSION_PROVIDER = dp -> {

    };



    public final InvariantDeviceProfile inv;

    private final Info mInfo;
@@ -112,6 +115,9 @@ public class DeviceProfile { 
    private WorkspaceSpecs mWorkspaceSpecs;

    private CalculatedWorkspaceSpec mResponsiveWidthSpec;

    private CalculatedWorkspaceSpec mResponsiveHeightSpec;

    private AllAppsSpecs mAllAppsSpecs;

    private CalculatedAllAppsSpec mAllAppsResponsiveWidthSpec;

    private CalculatedAllAppsSpec mAllAppsResponsiveHeightSpec;



    /**

     * The maximum amount of left/right workspace padding as a percentage of the screen width.
@@ -305,7 +311,8 @@ public class DeviceProfile { 
        mInsets.set(windowBounds.insets);



        // TODO(b/241386436): shouldn't change any launcher behaviour

        mIsResponsiveGrid = inv.workspaceSpecsId != INVALID_RESOURCE_HANDLE;

        mIsResponsiveGrid = inv.workspaceSpecsId != INVALID_RESOURCE_HANDLE

                && inv.allAppsSpecsId != INVALID_RESOURCE_HANDLE;



        mIsScalableGrid = inv.isScalable && !isVerticalBarLayout() && !isMultiWindowMode;

        // Determine device posture.
@@ -534,6 +541,13 @@ public class DeviceProfile { 
                    // don't use availableHeightPx because it subtracts bottom padding,

                    // but the hotseat go behind it

                    heightPx - mInsets.top - hotseatBarSizePx);



            mAllAppsSpecs = new AllAppsSpecs(new ResourceHelper(context, inv.allAppsSpecsId));

            mAllAppsResponsiveWidthSpec = mAllAppsSpecs.getCalculatedWidthSpec(inv.numColumns,

                    mResponsiveWidthSpec.getAvailableSpace(), mResponsiveWidthSpec);

            mAllAppsResponsiveHeightSpec = mAllAppsSpecs.getCalculatedHeightSpec(inv.numRows,

                    mResponsiveHeightSpec.getAvailableSpace(),

                    mResponsiveHeightSpec);

        }



        desiredWorkspaceHorizontalMarginPx = getHorizontalMarginPx(inv, res);
@@ -837,45 +851,6 @@ public class DeviceProfile { 
        }

    }



    /**

     * Re-computes the all-apps cell size to be independent of workspace

     */

    public void autoResizeAllAppsCells() {

        int textHeight = Utilities.calculateTextHeight(allAppsIconTextSizePx);

        int topBottomPadding = textHeight;

        allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx

                + textHeight + (topBottomPadding * 2);

    }



    private void updateAllAppsContainerWidth(Resources res) {

        int cellLayoutHorizontalPadding =

                (cellLayoutPaddingPx.left + cellLayoutPaddingPx.right) / 2;

        if (isTablet) {

            int usedWidth = (allAppsCellWidthPx * numShownAllAppsColumns)

                    + (allAppsBorderSpacePx.x * (numShownAllAppsColumns - 1))

                    + allAppsLeftRightPadding * 2;

            allAppsLeftRightMargin = Math.max(1, (availableWidthPx - usedWidth) / 2);

        } else {

            allAppsLeftRightPadding =

                    Math.max(0, desiredWorkspaceHorizontalMarginPx + cellLayoutHorizontalPadding

                            - (allAppsBorderSpacePx.x / 2));

        }

    }



    private void setupAllAppsStyle(Context context) {

        TypedArray allAppsStyle;

        if (inv.allAppsStyle != INVALID_RESOURCE_HANDLE) {

            allAppsStyle = context.obtainStyledAttributes(inv.allAppsStyle,

                    R.styleable.AllAppsStyle);

        } else {

            allAppsStyle = context.obtainStyledAttributes(R.style.AllAppsStyleDefault,

                    R.styleable.AllAppsStyle);

        }

        allAppsLeftRightPadding = allAppsStyle.getDimensionPixelSize(

                R.styleable.AllAppsStyle_horizontalPadding, 0);

        allAppsStyle.recycle();

    }



    /**

     * Returns the amount of extra (or unused) vertical space.

     */
@@ -1027,7 +1002,15 @@ public class DeviceProfile { 
        }



        // All apps

        if (mIsResponsiveGrid) {

            updateAllAppsWithResponsiveMeasures();

        } else {

            updateAllAppsIconSize(scale, res);

        }

        updateAllAppsContainerWidth();

        if (isVerticalBarLayout()) {

            hideWorkspaceLabelsIfNotEnoughSpace();

        }



        updateHotseatSizes(iconSizePx);
@@ -1113,11 +1096,56 @@ public class DeviceProfile { 
                    res.getDimensionPixelSize(R.dimen.all_apps_icon_drawable_padding);

            allAppsCellWidthPx = allAppsIconSizePx + (2 * allAppsIconDrawablePaddingPx);

        }

    }



        updateAllAppsContainerWidth(res);

        if (isVerticalBarLayout()) {

            hideWorkspaceLabelsIfNotEnoughSpace();

    private void updateAllAppsWithResponsiveMeasures() {

        allAppsIconSizePx = iconSizePx;

        allAppsIconTextSizePx = iconTextSizePx;

        allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;



        allAppsBorderSpacePx = new Point(

                mAllAppsResponsiveWidthSpec.getGutterPx(),

                mAllAppsResponsiveHeightSpec.getGutterPx()

        );

        allAppsCellHeightPx = mAllAppsResponsiveHeightSpec.getCellSizePx()

                + mAllAppsResponsiveHeightSpec.getGutterPx();

        allAppsCellWidthPx = mAllAppsResponsiveWidthSpec.getCellSizePx();

        allAppsLeftRightPadding = mAllAppsResponsiveWidthSpec.getStartPaddingPx();

    }



    /**

     * Re-computes the all-apps cell size to be independent of workspace

     */

    public void autoResizeAllAppsCells() {

        int textHeight = Utilities.calculateTextHeight(allAppsIconTextSizePx);

        int topBottomPadding = textHeight;

        allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx

                + textHeight + (topBottomPadding * 2);

    }



    private void updateAllAppsContainerWidth() {

        int cellLayoutHorizontalPadding =

                (cellLayoutPaddingPx.left + cellLayoutPaddingPx.right) / 2;

        if (isTablet) {

            int usedWidth = (allAppsCellWidthPx * numShownAllAppsColumns)

                    + (allAppsBorderSpacePx.x * (numShownAllAppsColumns - 1))

                    + allAppsLeftRightPadding * 2;

            allAppsLeftRightMargin = Math.max(1, (availableWidthPx - usedWidth) / 2);

        } else {

            allAppsLeftRightPadding =

                    Math.max(0, desiredWorkspaceHorizontalMarginPx + cellLayoutHorizontalPadding

                            - (allAppsBorderSpacePx.x / 2));

        }

    }



    private void setupAllAppsStyle(Context context) {

        TypedArray allAppsStyle = context.obtainStyledAttributes(

                inv.allAppsStyle != INVALID_RESOURCE_HANDLE ? inv.allAppsStyle

                        : R.style.AllAppsStyleDefault, R.styleable.AllAppsStyle);



        allAppsLeftRightPadding = allAppsStyle.getDimensionPixelSize(

                R.styleable.AllAppsStyle_horizontalPadding, 0);

        allAppsStyle.recycle();

    }



    private void updateAvailableFolderCellDimensions(Resources res) {
@@ -1808,6 +1836,10 @@ public class DeviceProfile { 
        if (mIsResponsiveGrid) {

            writer.println(prefix + "\tmResponsiveHeightSpec:" + mResponsiveHeightSpec.toString());

            writer.println(prefix + "\tmResponsiveWidthSpec:" + mResponsiveWidthSpec.toString());

            writer.println(prefix + "\tmAllAppsResponsiveHeightSpec:"

                    + mAllAppsResponsiveHeightSpec.toString());

            writer.println(prefix + "\tmAllAppsResponsiveWidthSpec:"

                    + mAllAppsResponsiveWidthSpec.toString());

        }

    }

src/com/android/launcher3/InvariantDeviceProfile.java

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ public class InvariantDeviceProfile { 
    public int devicePaddingId = INVALID_RESOURCE_HANDLE;

    @XmlRes

    public int workspaceSpecsId = INVALID_RESOURCE_HANDLE;

    @XmlRes

    public int allAppsSpecsId = INVALID_RESOURCE_HANDLE;



    public String dbFile;

    public int defaultLayoutId;
@@ -353,6 +355,7 @@ public class InvariantDeviceProfile { 
        isScalable = closestProfile.isScalable;

        devicePaddingId = closestProfile.devicePaddingId;

        workspaceSpecsId = closestProfile.mWorkspaceSpecsId;

        allAppsSpecsId = closestProfile.mAllAppsSpecsId;

        this.deviceType = deviceType;



        inlineNavButtonsEndSpacing = closestProfile.inlineNavButtonsEndSpacing;
@@ -799,6 +802,7 @@ public class InvariantDeviceProfile { 
        private final boolean isScalable;

        private final int devicePaddingId;

        private final int mWorkspaceSpecsId;

        private final int mAllAppsSpecsId;



        public GridOption(Context context, AttributeSet attrs) {

            TypedArray a = context.obtainStyledAttributes(
@@ -863,8 +867,11 @@ public class InvariantDeviceProfile { 
            if (FeatureFlags.ENABLE_RESPONSIVE_WORKSPACE.get()) {

                mWorkspaceSpecsId = a.getResourceId(

                        R.styleable.GridDisplayOption_workspaceSpecsId, INVALID_RESOURCE_HANDLE);

                mAllAppsSpecsId = a.getResourceId(

                        R.styleable.GridDisplayOption_allAppsSpecsId, INVALID_RESOURCE_HANDLE);

            } else {

                mWorkspaceSpecsId = INVALID_RESOURCE_HANDLE;

                mAllAppsSpecsId = INVALID_RESOURCE_HANDLE;

            }



            int inlineForRotation = a.getInt(R.styleable.GridDisplayOption_inlineQsb,