diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:26:23 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:27:51 -0800 |
| commit | 7c50b31f57e3e3ec1f433d243afe05554dcaf977 (patch) | |
| tree | b244d7b5cf1d0c7e753fb3f6751c4108cd87d0a5 /res/values/dimens.xml | |
| parent | 323117ca37483c2adcd14b9969e2a36ea57a9d6a (diff) | |
| parent | 3826bab27ef3e7608aba112bd0f5ce2e7c3eac5b (diff) | |
| download | android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.gz android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.bz2 android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.zip | |
resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.
Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 37e4d0419..468beaa37 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -72,7 +72,7 @@ <dimen name="all_apps_grid_view_start_margin">0dp</dimen> <dimen name="all_apps_grid_section_y_offset">8dp</dimen> <dimen name="all_apps_grid_section_text_size">24sp</dimen> - <dimen name="all_apps_search_bar_height">48dp</dimen> + <dimen name="all_apps_search_bar_height">60dp</dimen> <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen> <dimen name="all_apps_icon_width_gap">24dp</dimen> <!-- The top padding should account for the existing all_apps_list_top_bottom_padding --> @@ -84,6 +84,19 @@ <dimen name="all_apps_background_canvas_width">700dp</dimen> <dimen name="all_apps_background_canvas_height">475dp</dimen> + <!-- Search bar in All Apps --> + <dimen name="all_apps_header_max_elevation">4dp</dimen> + <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen> + <dimen name="all_apps_header_shadow_height">6dp</dimen> + + <!-- The overflow is used to create a bottom border, by drawing other three sides + outside the bounds. Ensure that: + all_apps_search_bar_bg_overflow < (-3 * all_apps_search_bar_divider_width) + -6dp is picked at random, any smaller value would do. + --> + <dimen name="all_apps_search_bar_bg_overflow">-6dp</dimen> + <dimen name="all_apps_search_bar_divider_width">1dp</dimen> + <!-- Widget tray --> <dimen name="widget_preview_label_vertical_padding">8dp</dimen> <dimen name="widget_preview_label_horizontal_padding">8dp</dimen> |