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

Commit 6d9e8666 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update hotseat sizing for 4x5 grids." into sc-dev

parents e0e64b48 069f8c5a

res/xml/size_limits_80x104.xml

+4 −4
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ 
            launcher:b="16dp"/>

        <workspaceBottomPadding

            launcher:a="1"

            launcher:c="52dp"/>

            launcher:c="72dp"/>

        <hotseatBottomPadding

            launcher:a="0"

            launcher:b="36dp"/>

            launcher:b="56dp"/>

    </device-padding>



    <device-padding
@@ -93,10 +93,10 @@ 
            launcher:b="39dp"/>

        <workspaceBottomPadding

            launcher:a="1"

            launcher:c="75dp"/>

            launcher:c="95dp"/>

        <hotseatBottomPadding

            launcher:a="0"

            launcher:b="36dp"/>

            launcher:b="56dp"/>

    </device-padding>



    <device-padding

src/com/android/launcher3/Hotseat.java

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public class Hotseat extends CellLayout implements Insettable { 
                ? dp.workspacePadding.bottom

                : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;



        if (dp.isScalableGrid) {

        if (dp.isScalableGrid && dp.qsbBottomMarginPx > dp.getInsets().bottom) {

            return Math.min(dp.qsbBottomMarginPx, freeSpace);

        } else {

            return (int) (freeSpace * QSB_CENTER_FACTOR) + (dp.isTaskbarPresent