diff options
| author | Tony Wickham <twickham@google.com> | 2015-11-12 23:46:33 +0000 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-11-12 23:46:33 +0000 |
| commit | 1974e98f5ec4713e50ba64ec32a7607c92ddce9b (patch) | |
| tree | 8e29d499b960ebb3a56cbb4bcfe074220443d5cc /src/com/android/launcher3/DeviceProfile.java | |
| parent | b25e684a766362422f5693f7a2189910c1275584 (diff) | |
| download | android_packages_apps_Trebuchet-1974e98f5ec4713e50ba64ec32a7607c92ddce9b.tar.gz android_packages_apps_Trebuchet-1974e98f5ec4713e50ba64ec32a7607c92ddce9b.tar.bz2 android_packages_apps_Trebuchet-1974e98f5ec4713e50ba64ec32a7607c92ddce9b.zip | |
Revert "Reverting folder cell width on portrait phones."
This reverts commit b25e684a766362422f5693f7a2189910c1275584.
Change-Id: Ie86adc4b35c73ab7ef78d73225b437adc4751172
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 ccbfba178..c0ad5163f 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; |