diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-27 22:14:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-27 22:14:45 +0000 |
commit | 184f018ea1da41ed6d79951ad6e726ae5b8742cc (patch) | |
tree | 8178fa92cd4b926f985a2a297988584c78ffc82a /src/com | |
parent | fe5008c997b683c2dcd1a8d78503771a56599607 (diff) | |
parent | 72b5fd186e7c9399b9c7853d1fc1f3d678ce5f30 (diff) | |
download | android_packages_apps_Trebuchet-184f018ea1da41ed6d79951ad6e726ae5b8742cc.tar.gz android_packages_apps_Trebuchet-184f018ea1da41ed6d79951ad6e726ae5b8742cc.tar.bz2 android_packages_apps_Trebuchet-184f018ea1da41ed6d79951ad6e726ae5b8742cc.zip |
Merge "Grid change polish bugs." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/folder/PreviewBackground.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index dcfb268d1..eef651044 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 44ebbcda7..eb6a6d5d8 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. |