summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-07-14 23:17:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-14 23:17:58 +0000
commit95b97c5dec0e0fffc2dd5a02c648f7a2ed41060c (patch)
treef3223a6f9966bc34c1a944a70279a523c0641fbe /src/com
parent07eeb60c4772010eacfdbf83dd5cbf7e35099074 (diff)
parent4e358271d3e7e64adf0562386f97cc0e1d6e4426 (diff)
downloadandroid_packages_apps_Trebuchet-95b97c5dec0e0fffc2dd5a02c648f7a2ed41060c.tar.gz
android_packages_apps_Trebuchet-95b97c5dec0e0fffc2dd5a02c648f7a2ed41060c.tar.bz2
android_packages_apps_Trebuchet-95b97c5dec0e0fffc2dd5a02c648f7a2ed41060c.zip
Merge "Tighten up vertical spacing in landscape all apps." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 6b76cd62f..ca5d8e746 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -326,7 +326,13 @@ public class DeviceProfile {
if (isVerticalBarLayout()) {
// Always hide the Workspace text with vertical bar layout.
iconTextSizePx = 0;
- allAppsCellHeightPx += Utilities.calculateTextHeight(allAppsIconTextSizePx);
+ iconDrawablePaddingPx = 0;
+
+ // Manually compute all apps cell height since workspace cells have less content.
+ allAppsCellHeightPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx
+ + Utilities.calculateTextHeight(allAppsIconTextSizePx)
+ // Top and bottom padding is equal to the drawable padding
+ + allAppsIconDrawablePaddingPx * 2;
}
cellWidthPx = iconSizePx + iconDrawablePaddingPx;