diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-01-17 22:32:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-17 22:32:22 +0000 |
| commit | 5ac62d6914067c48e1fcdb3f6f149532017c5803 (patch) | |
| tree | 51649cbd2335e4cfecf7e6dbe7d628880c355aa8 | |
| parent | e6e0af03ee39b3e800c8f7e86eefffae432ee7c8 (diff) | |
| parent | efb31e399d335351a8db3de54ed66fabd30606ba (diff) | |
| download | android_packages_apps_Trebuchet-5ac62d6914067c48e1fcdb3f6f149532017c5803.tar.gz android_packages_apps_Trebuchet-5ac62d6914067c48e1fcdb3f6f149532017c5803.tar.bz2 android_packages_apps_Trebuchet-5ac62d6914067c48e1fcdb3f6f149532017c5803.zip | |
Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |