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

Commit 7a273e2a authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

resolve merge conflicts of a754e678 to sc-v2-dev 

Move qsb according to spec.

Bug: 175329686
Test: visual test
      checked 5x5 and confirmed no visual change
      checked 4x5 and confirmed visual change
      - tested various display sizes to ensure no overlapping is caused


Change-Id: I5e00fcf57ffde597c6af08c6464ddfd7e8456bca
Merged-In: I95a80b484516f634fa13347534810c7a51cecc8d
parents 69a7768e a754e678

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


    <!-- Scalable Grid -->

    <dimen name="scalable_grid_left_right_margin">22dp</dimen>

    <dimen name="scalable_grid_qsb_bottom_margin">42dp</dimen>



    <!-- Workspace page indicator -->

    <dimen name="workspace_page_indicator_height">24dp</dimen>

src/com/android/launcher3/DeviceProfile.java

+15 −1
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ public class DeviceProfile { 
    public final int hotseatBarSidePaddingEndPx;

    public final int hotseatQsbHeight;



    public final float qsbBottomMarginOriginalPx;

    public int qsbBottomMarginPx;



    // All apps

    public int allAppsOpenVerticalTranslate;

    public int allAppsCellHeightPx;
@@ -336,6 +339,10 @@ public class DeviceProfile { 
                res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_extra_vertical_size);

        updateHotseatIconSize(pxFromDp(inv.iconSize, mMetrics, 1f));



        qsbBottomMarginOriginalPx = isScalableGrid

                ? res.getDimensionPixelSize(R.dimen.scalable_grid_qsb_bottom_margin)

                : 0;



        overviewTaskMarginPx = res.getDimensionPixelSize(R.dimen.overview_task_margin);

        overviewTaskIconSizePx =

                isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() ? res.getDimensionPixelSize(
@@ -364,6 +371,8 @@ public class DeviceProfile { 
            extraHotseatBottomPadding = Math.round(paddingHotseatBottom * iconScale);



            hotseatBarSizePx += extraHotseatBottomPadding;



            qsbBottomMarginPx = Math.round(qsbBottomMarginOriginalPx * iconScale);

        } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {

            // We increase the hotseat size when there is extra space.

            // ie. For a display with a large aspect ratio, we can keep the icons on the workspace
@@ -810,9 +819,14 @@ public class DeviceProfile { 
        int freeSpace = isTaskbarPresent

                ? workspacePadding.bottom

                : hotseatBarSizePx - hotseatCellHeightPx - hotseatQsbHeight;



        if (isScalableGrid && qsbBottomMarginPx <= freeSpace) {

            return qsbBottomMarginPx;

        } else {

            return (int) (freeSpace * QSB_CENTER_FACTOR)

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

        }

    }



    /**

     * Returns the number of pixels the taskbar is translated from the bottom of the screen.