summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DeviceProfile.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-01-16 16:07:50 -0800
committerAdam Cohen <adamcohen@google.com>2014-01-16 16:09:05 -0800
commitefb31e399d335351a8db3de54ed66fabd30606ba (patch)
tree8ad8b15097382a03cea5a72ba0d9fb8c6b57dc82 /src/com/android/launcher3/DeviceProfile.java
parentf8584042713aad82f9d057ecaace8a9ad1aad0bc (diff)
downloadandroid_packages_apps_Trebuchet-efb31e399d335351a8db3de54ed66fabd30606ba.tar.gz
android_packages_apps_Trebuchet-efb31e399d335351a8db3de54ed66fabd30606ba.tar.bz2
android_packages_apps_Trebuchet-efb31e399d335351a8db3de54ed66fabd30606ba.zip
Fix overlapping pages (issue 12551580)
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java2
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);
}
}