diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 08073ce0de..0db0e615fd 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -27,8 +27,7 @@ 120dp 24dp - 8dp - 8dp + 5dp 18dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index dcfb268d15..eef651044b 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -344,7 +344,7 @@ public class DeviceProfile { updateFolderCellSize(1f, dm, res); // Don't let the folder get too close to the edges of the screen. - int folderMargin = 4 * edgeMarginPx; + int folderMargin = edgeMarginPx; // Check if the icons fit within the available height. float usedHeight = folderCellHeightPx * inv.numFolderRows + folderBottomPanelSize; @@ -497,7 +497,7 @@ public class DeviceProfile { // In portrait, we want the pages spaced such that there is no // overhang of the previous / next page into the current page viewport. // We assume symmetrical padding in portrait mode. - return Math.max(defaultPageSpacingPx, getWorkspacePadding(null).left + 1); + return Math.max(defaultPageSpacingPx, getWorkspacePadding(null).left / 2 + 1); } } diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index 44ebbcda79..eb6a6d5d8e 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -88,7 +88,7 @@ public class PreviewBackground { public boolean isClipping = true; // Drawing / animation configurations - private static final float ACCEPT_SCALE_FACTOR = 1.25f; + private static final float ACCEPT_SCALE_FACTOR = 1.20f; private static final float ACCEPT_COLOR_MULTIPLIER = 1.5f; // Expressed on a scale from 0 to 255.