summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DeviceProfile.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-12 15:57:23 -0700
committerTony Wickham <twickham@google.com>2015-10-12 15:57:23 -0700
commita295048a69d35b5adc3f021c3d40c32700cc9629 (patch)
tree9657eb56c635d449950258999327abd64e0ca85d /src/com/android/launcher3/DeviceProfile.java
parentf7203499f40af2afbcf20d5ff7555c97d86ad841 (diff)
downloadandroid_packages_apps_Trebuchet-a295048a69d35b5adc3f021c3d40c32700cc9629.tar.gz
android_packages_apps_Trebuchet-a295048a69d35b5adc3f021c3d40c32700cc9629.tar.bz2
android_packages_apps_Trebuchet-a295048a69d35b5adc3f021c3d40c32700cc9629.zip
Increase folder cell width slightly.
The increased breathing room makes it more likely that long app names will fit in the folder cells without being cut off. Bug: 22462641 Change-Id: I110ede040f9e8fdddbf0c4e7a395ac71435559f3
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 947b16440..5778763a4 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -229,7 +229,8 @@ public class DeviceProfile {
hotseatCellHeightPx = iconSizePx;
// Folder
- folderCellWidthPx = cellWidthPx + 3 * edgeMarginPx;
+ folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
+ (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
folderCellHeightPx = cellHeightPx + edgeMarginPx;
folderBackgroundOffset = -edgeMarginPx;
folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset;