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

Commit 48bda0f8 authored by Kshitij's avatar Kshitij
Browse files

fix: Add vertical margin to match mockup

parent 26a34eb7

src/com/android/launcher3/Workspace.java

+10 −6
Original line number Original line Diff line number Diff line
@@ -437,21 +437,25 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 
        Rect padding = grid.cellLayoutPaddingPx;

        Rect padding = grid.cellLayoutPaddingPx;

        setOrientation(mLauncher);

        setOrientation(mLauncher);

        int tabletMarginMultiplier = grid.isLandscape ? 3 : 2;

        int tabletMarginMultiplier = grid.isLandscape ? 3 : 2;

        int leftCorrection = ((grid.isVerticalBarLayout() && mOrientation == Surface.ROTATION_270)

        Rect correction = new Rect();

        correction.left = ((grid.isVerticalBarLayout() && mOrientation == Surface.ROTATION_270)

                ? grid.hotseatBarSizePx : 0)

                ? grid.hotseatBarSizePx : 0)

                + (grid.isTablet ? (padding.left * tabletMarginMultiplier) : 0);

                + (grid.isTablet ? (padding.left * tabletMarginMultiplier) : 0);

        int rightCorrection = ((grid.isVerticalBarLayout() && mOrientation == Surface.ROTATION_90)

        correction.right = ((grid.isVerticalBarLayout() && mOrientation == Surface.ROTATION_90)

                ? grid.hotseatBarSizePx : 0)

                ? grid.hotseatBarSizePx : 0)

                + (grid.isTablet ? (padding.left * tabletMarginMultiplier) : 0);

                + (grid.isTablet ? (padding.left * tabletMarginMultiplier) : 0);

        int verticalMargin = grid.isTablet ? (grid.edgeMarginPx * tabletMarginMultiplier / 2) : 0;

        correction.top = verticalMargin;

        correction.bottom = verticalMargin;

        mWorkspaceScreens.forEach(s -> {

        mWorkspaceScreens.forEach(s -> {

            int widgetPadding = getResources().getDimensionPixelSize(R.dimen.widget_page_all_padding);

            int widgetPadding = getResources().getDimensionPixelSize(R.dimen.widget_page_all_padding);

            if (grid.isLandscape) widgetPadding *= grid.isTablet ? 40 : 20;

            if (grid.isLandscape) widgetPadding *= grid.isTablet ? 40 : 20;

            int paddingTop = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID)) ? 0 : padding.top;

            int paddingTop = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID)) ? 0 : (padding.top + correction.top);

            int paddingBottom = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID)) ? 0 : padding.bottom;

            int paddingBottom = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID)) ? 0 : (padding.bottom + correction.bottom);

            int paddingLeft = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID))

            int paddingLeft = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID))

                    ? widgetPadding : (padding.left + leftCorrection);

                    ? widgetPadding : (padding.left + correction.left);

            int paddingRight = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID))

            int paddingRight = (s == mWorkspaceScreens.get(FIRST_SCREEN_ID))

                    ? widgetPadding : (padding.right + rightCorrection);

                    ? widgetPadding : (padding.right + correction.right);

            if (grid.isLandscape) {

            if (grid.isLandscape) {

                grid.inv.numRows = grid.inv.numColumnsFixed;

                grid.inv.numRows = grid.inv.numColumnsFixed;

                grid.inv.numColumns = grid.inv.numRowsFixed;

                grid.inv.numColumns = grid.inv.numRowsFixed;