diff options
| author | Tony Wickham <twickham@google.com> | 2015-11-12 23:52:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-12 23:52:34 +0000 |
| commit | 0309fbc65ff99285e67cf3f6ec025a656977e86e (patch) | |
| tree | 2794e3a95bf865bdeb7a2052ec3adf29262cd4e4 /src/com/android/launcher3/DeviceProfile.java | |
| parent | 79b4194765c5cea13aae6064099735d147ad8efc (diff) | |
| parent | 1974e98f5ec4713e50ba64ec32a7607c92ddce9b (diff) | |
| download | android_packages_apps_Trebuchet-0309fbc65ff99285e67cf3f6ec025a656977e86e.tar.gz android_packages_apps_Trebuchet-0309fbc65ff99285e67cf3f6ec025a656977e86e.tar.bz2 android_packages_apps_Trebuchet-0309fbc65ff99285e67cf3f6ec025a656977e86e.zip | |
Revert "Reverting folder cell width on portrait phones."
am: 1974e98f5e
* commit '1974e98f5ec4713e50ba64ec32a7607c92ddce9b':
Revert "Reverting folder cell width on portrait phones."
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 5032dcf19..d2ca8f60d 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -245,9 +245,7 @@ public class DeviceProfile { hotseatCellHeightPx = iconSizePx; // Folder - int folderCellPadding = isTablet || isLandscape ? 6 * edgeMarginPx : 3 * edgeMarginPx; - // Don't let the folder get too close to the edges of the screen. - folderCellWidthPx = Math.min(cellWidthPx + folderCellPadding, + folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx, (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns); folderCellHeightPx = cellHeightPx + edgeMarginPx; folderBackgroundOffset = -edgeMarginPx; |