From efb31e399d335351a8db3de54ed66fabd30606ba Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 16 Jan 2014 16:07:50 -0800 Subject: [PATCH 1/2] Fix overlapping pages (issue 12551580) Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f --- 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 8bcf6c32e0..7ca4f811c2 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); } } From 3abfd16e5d8f4af36fbe7e8c429cdd1227af1a50 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 17 Jan 2014 14:43:02 -0800 Subject: [PATCH 2/2] Adding specific buckets for N5 in dynamic grid. (Bug 12604220) Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857 --- src/com/android/launcher3/DynamicGrid.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index cbde99113f..447bb1cd87 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -70,9 +70,11 @@ public class DynamicGrid { deviceProfiles.add(new DeviceProfile("Nexus S", 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48)); deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56)); + 335, 567, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56)); + deviceProfiles.add(new DeviceProfile("Nexus 5", + 359, 567, 4, 4, DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56)); deviceProfiles.add(new DeviceProfile("Large Phone", - 400, 680, 5, 5, 64, 14.4f, 5, 56)); + 406, 694, 5, 5, 64, 14.4f, 5, 56)); // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7",