commit a4db090b1345038a89a38ba8af6ac74f71e2ed7c
author Adam Cohen <adamcohen@google.com> Sat Jan 18 00:21:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 18 00:21:57 2014 +0000
tree 4346d9beee7b2e3894674cc1bc657995981a2349
parent 5ac62d6914067c48e1fcdb3f6f149532017c5803
parent 3abfd16e5d8f4af36fbe7e8c429cdd1227af1a50

Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 8bcf6c3..7ca4f81 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -557,7 +557,7 @@
             // 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);
         }
     }