diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-30 10:37:43 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-10-30 10:37:43 -0700 |
| commit | c1ff24c0779d40ac5dcadc05ce51b7056a4286bb (patch) | |
| tree | 56420909e0bf52267165da9ee126ed8b13123e76 /res/values/dimens.xml | |
| parent | c3642d45098eed97ee278f7db370335d7fd407fc (diff) | |
| parent | a3c74d10a7d6e2ae8520e73176f939011e726ccf (diff) | |
| download | android_packages_apps_Trebuchet-c1ff24c0779d40ac5dcadc05ce51b7056a4286bb.tar.gz android_packages_apps_Trebuchet-c1ff24c0779d40ac5dcadc05ce51b7056a4286bb.tar.bz2 android_packages_apps_Trebuchet-c1ff24c0779d40ac5dcadc05ce51b7056a4286bb.zip | |
resolve merge conflicts of a3c74d10a7 to ub-launcher3-master.
Change-Id: Ibeb2499ac278e4094a2922501cfffad2489e58ed
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c30ee1d72..90083c09c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -17,11 +17,15 @@ <resources> <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">6dp</dimen> - <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen> - <dimen name="dynamic_grid_search_bar_height">56dp</dimen> - <!-- We want 32dp extra for the tall search bar, but 10dp comes from unwanted padding between - the search bar and workspace. --> - <dimen name="dynamic_grid_search_bar_height_tall">78dp</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> + <dimen name="qsb_internal_padding_top">8dp</dimen> + <dimen name="qsb_internal_padding_bottom">8dp</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_padding_tablet">16dp</dimen> <dimen name="dynamic_grid_page_indicator_height">20dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> |