diff options
| author | Tony Wickham <twickham@google.com> | 2016-02-01 14:51:35 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-02-01 14:51:35 -0800 |
| commit | c32c63c46e933fb6c9038f6e18f24a2fef7eff9c (patch) | |
| tree | 099fda5e4089ae87581ae31e157dd9570bf642e6 /res/values/dimens.xml | |
| parent | ad37152c14c716f678d07dd568811a9704c2a9c8 (diff) | |
| parent | b9759d399be4269a65b08988e50148f7d971fdf3 (diff) | |
| download | android_packages_apps_Trebuchet-c32c63c46e933fb6c9038f6e18f24a2fef7eff9c.tar.gz android_packages_apps_Trebuchet-c32c63c46e933fb6c9038f6e18f24a2fef7eff9c.tar.bz2 android_packages_apps_Trebuchet-c32c63c46e933fb6c9038f6e18f24a2fef7eff9c.zip | |
resolve merge conflicts of b9759d399b to ub-launcher3-calgary.
Change-Id: I66230c15e5eaeef316d4e2f14b85c6ff1b6e977d
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 041b82bf8..37e4d0419 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,13 +18,16 @@ <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">6dp</dimen> <dimen name="dynamic_grid_search_bar_height">48dp</dimen> - <!-- We want 32dp extra for the tall search bar. --> - <dimen name="dynamic_grid_search_bar_height_tall">80dp</dimen> + <!-- We want 46dp extra for the tall search bar. --> + <dimen name="dynamic_grid_search_bar_height_tall">94dp</dimen> <dimen name="qsb_internal_padding_top">8dp</dimen> <dimen name="qsb_internal_padding_bottom">8dp</dimen> + <dimen name="dynamic_grid_search_bar_extra_top_padding">0dp</dimen> + <!-- Reduce the space between the status bar and the search bar when the search bar is tall --> + <dimen name="dynamic_grid_search_bar_negative_top_padding_short">-4dp</dimen> <dimen name="dynamic_grid_search_bar_bottom_padding">4dp</dimen> <!-- Reduce the padding between the search bar and workspace when the search bar is tall --> - <dimen name="dynamic_grid_search_bar_bottom_padding_short">-6dp</dimen> + <dimen name="dynamic_grid_search_bar_bottom_negative_padding_short">-6dp</dimen> <dimen name="dynamic_grid_search_bar_bottom_padding_tablet">16dp</dimen> <dimen name="dynamic_grid_page_indicator_height">20dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> |