diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-01-17 14:34:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-17 14:34:19 -0800 |
| commit | 0d5de134258f71269a2d3b846521544bbad2a2eb (patch) | |
| tree | 8e26fe76c6804eb7f397b218e1b14d1132179dbd | |
| parent | c07347961e9c924aa042b9e1d3526e9b5e1c95ca (diff) | |
| parent | 5ac62d6914067c48e1fcdb3f6f149532017c5803 (diff) | |
| download | android_packages_apps_Trebuchet-0d5de134258f71269a2d3b846521544bbad2a2eb.tar.gz android_packages_apps_Trebuchet-0d5de134258f71269a2d3b846521544bbad2a2eb.tar.bz2 android_packages_apps_Trebuchet-0d5de134258f71269a2d3b846521544bbad2a2eb.zip | |
am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
* commit '5ac62d6914067c48e1fcdb3f6f149532017c5803':
Fix overlapping pages (issue 12551580)
| -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); } } |