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

Commit 831225d8 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 6d9e8666 to... 

Merge "resolve merge conflicts of 6d9e8666 to sc-v2-dev" into sc-v2-dev
parents 192cbbbd 8f16a770

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/DeviceProfile.java

+3 −3
Original line number Diff line number Diff line
@@ -848,11 +848,11 @@ public class DeviceProfile { 
                ? workspacePadding.bottom

                : hotseatBarSizePx - hotseatCellHeightPx - hotseatQsbHeight;



        if (isScalableGrid) {

        if (isScalableGrid && qsbBottomMarginPx > mInsets.bottom) {

            return Math.min(qsbBottomMarginPx, freeSpace);

        } else {

            return (int) (freeSpace * QSB_CENTER_FACTOR)

                + (isTaskbarPresent ? taskbarSize : getInsets().bottom);

                + (isTaskbarPresent ? taskbarSize : mInsets.bottom);

        }

    }