summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-01-16 16:07:50 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:27 -0700
commit4aa39f0056f6749e73bfedb486cc713025a6e5ba (patch)
tree27d4fa37b5441c734f0a39d8708c4392efea32e8 /src/com/android
parent05725d8f83ab71c0f3f3dfa42a6cc4c971d2eb4d (diff)
downloadandroid_packages_apps_Trebuchet-4aa39f0056f6749e73bfedb486cc713025a6e5ba.tar.gz
android_packages_apps_Trebuchet-4aa39f0056f6749e73bfedb486cc713025a6e5ba.tar.bz2
android_packages_apps_Trebuchet-4aa39f0056f6749e73bfedb486cc713025a6e5ba.zip
Fix overlapping pages (issue 12551580)
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
Diffstat (limited to 'src/com/android')
-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 1eb5e846a..79fbbb66b 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -574,7 +574,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);
}
}