diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-14 23:17:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-14 23:17:58 +0000 |
| commit | 95b97c5dec0e0fffc2dd5a02c648f7a2ed41060c (patch) | |
| tree | f3223a6f9966bc34c1a944a70279a523c0641fbe | |
| parent | 07eeb60c4772010eacfdbf83dd5cbf7e35099074 (diff) | |
| parent | 4e358271d3e7e64adf0562386f97cc0e1d6e4426 (diff) | |
| download | android_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
| -rw-r--r-- | res/values-land/dimens.xml | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 1ab385cb2..3ecdf59dc 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -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> 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; |