diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 58aeda4c0d..cf5b14caf4 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -35,4 +35,7 @@ 2dp 6dp 6dp + + + 24dp diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 823fc62372..834d8ee093 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -44,4 +44,7 @@ 16dp 16dp 56dp + + + 6dp diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 83d40d59f7..2a093f057d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -367,8 +367,9 @@ - 22dp - 6dp + 28dp + 6dp + 6dp 48dp diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index d235180314..f7133c49dd 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -148,7 +148,8 @@ public class CellLayout extends ViewGroup { private boolean mVisualizeDropLocation = true; private RectF mVisualizeGridRect = new RectF(); private Paint mVisualizeGridPaint = new Paint(); - private int mGridVisualizationPadding; + private int mGridVisualizationPaddingX; + private int mGridVisualizationPaddingY; private int mGridVisualizationRoundingRadius; private float mGridAlpha = 0f; private int mGridColor = 0; @@ -260,8 +261,10 @@ public class CellLayout extends ViewGroup { mBackground.setAlpha(0); mGridColor = Themes.getAttrColor(getContext(), R.attr.workspaceAccentColor); - mGridVisualizationPadding = - res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing); + mGridVisualizationPaddingX = res.getDimensionPixelSize( + R.dimen.grid_visualization_horizontal_cell_spacing); + mGridVisualizationPaddingY = res.getDimensionPixelSize( + R.dimen.grid_visualization_vertical_cell_spacing); mGridVisualizationRoundingRadius = res.getDimensionPixelSize(R.dimen.grid_visualization_rounding_radius); mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx); @@ -591,8 +594,8 @@ public class CellLayout extends ViewGroup { protected void visualizeGrid(Canvas canvas) { DeviceProfile dp = mActivity.getDeviceProfile(); - int paddingX = (int) Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPadding); - int paddingY = (int) Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPadding); + int paddingX = Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPaddingX); + int paddingY = Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPaddingY); mVisualizeGridRect.set(paddingX, paddingY, mCellWidth - paddingX, mCellHeight - paddingY);