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

Commit 0658dc78 authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

resolve merge conflicts of 2e8356ba to sc-v2-dev-plus-aosp 

Add more extra space to hotseat for taller devices.

Bug: 194533332
Bug: 192520231
Change-Id: Ia0fa307bb4085e6fbc5d873b6dec63ab7fb53fea
Test: manual test on taller devices
parents c116dca4 2e8356ba

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

        }

    }