From 930514df0529ff5316bb00f3e45a4de036b7f5aa Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 16 Jan 2014 16:07:50 -0800 Subject: [PATCH] Fix overlapping pages (issue 12551580) Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f (cherry picked from commit efb31e399d335351a8db3de54ed66fabd30606ba) --- src/com/android/launcher3/DeviceProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 8bcf6c32e..7ca4f811c 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -557,7 +557,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 2 * getWorkspacePadding().left; + return Math.max(defaultPageSpacingPx, 2 * getWorkspacePadding().left); } } -- 2.11.0