summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/DeviceProfile.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-12 23:25:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-12 23:25:24 +0000
commitbe424b2c32a878608411bc0748bc88300046cc27 (patch)
tree377c7a565bd7e4816c64b4d4476ac92dd8a52473 /src/com/android/launcher3/DeviceProfile.java
parente906643c70ea73e3e506dd260a8ccc71c7c357bb (diff)
parenta295048a69d35b5adc3f021c3d40c32700cc9629 (diff)
downloadandroid_packages_apps_Trebuchet-be424b2c32a878608411bc0748bc88300046cc27.tar.gz
android_packages_apps_Trebuchet-be424b2c32a878608411bc0748bc88300046cc27.tar.bz2
android_packages_apps_Trebuchet-be424b2c32a878608411bc0748bc88300046cc27.zip
am a295048a: Increase folder cell width slightly.
* commit 'a295048a69d35b5adc3f021c3d40c32700cc9629': Increase folder cell width slightly.
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 4a489dee8..4ee8a5115 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;