Tighten up vertical spacing in landscape all apps. am: 4e358271d3 am: c38dde8fc0

Change-Id: I8186112db09300432a94b6fa35c391946d2daa1d
2017-07-14 23:05:43 +00:00
parent f3d1437a22 c38dde8fc0
commit 3f5ee6da9d
2 changed files with 10 additions and 2 deletions
@@ -27,7 +27,9 @@
    <!-- Dynamic grid -->
    <dimen name="dynamic_grid_overview_bar_item_width">120dp</dimen>
    <dimen name="dynamic_grid_min_page_indicator_size">48dp</dimen>
-    <dimen name="folder_preview_padding">5dp</dimen>
+    <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
+
+    <dimen name="folder_preview_padding">2dp</dimen>

    <!-- Hotseat -->
    <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">18dp</dimen>
@@ -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;