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

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

Merge changes from topic "am-b9751869-5607-4cac-8442-b1dba848150a" into ub-launcher3-master 

* changes:
  [automerger] Update launcher grid for tablet devices. am: 5eacbb7f
  Update launcher grid for tablet devices.
parents 9331521b 36d5963b

res/xml/device_profiles.xml

+4 −4
Original line number Diff line number Diff line
@@ -133,13 +133,13 @@ 
        launcher:name="Nexus 7"

        launcher:minWidthDps="575"

        launcher:minHeightDps="904"

        launcher:numRows="5"

        launcher:numRows="6"

        launcher:numColumns="6"

        launcher:numFolderRows="4"

        launcher:numFolderColumns="5"

        launcher:iconSize="64"

        launcher:iconTextSize="14.4"

        launcher:numHotseatIcons="7"

        launcher:numHotseatIcons="6"

        launcher:defaultLayoutId="@xml/default_workspace_5x6"

        />
@@ -147,8 +147,8 @@ 
        launcher:name="Nexus 10"

        launcher:minWidthDps="727"

        launcher:minHeightDps="1207"

        launcher:numRows="5"

        launcher:numColumns="6"

        launcher:numRows="6"

        launcher:numColumns="7"

        launcher:numFolderRows="4"

        launcher:numFolderColumns="5"

        launcher:iconSize="76"

src/com/android/launcher3/DeviceProfile.java

+6 −1
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ public class DeviceProfile { 


    private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f;



    // To evenly space the icons, increase the left/right margins for tablets in portrait mode.

    private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;



    // Workspace

    public final int desiredWorkspaceLeftRightMarginPx;

    public final int cellLayoutPaddingLeftRightPx;
@@ -172,7 +175,9 @@ public class DeviceProfile { 
        defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);

        edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);

        desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;

        cellLayoutPaddingLeftRightPx =

        int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet

                ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;

        cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier *

                res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);

        cellLayoutBottomPaddingPx =

                res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_bottom_padding);