Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit

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);
         }
     }