diff options
| author | Peter Schiller <peterschiller@google.com> | 2016-07-11 19:53:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-11 19:53:58 +0000 |
| commit | c9b6d8432837c578b602a0d779bc425db27cb42e (patch) | |
| tree | 8418d12e9bd81ef6c9cecf6c27c6d5703a26a17b /res/values | |
| parent | b30562da1eb2ab2b8c5e0a6c03625f63523bfbbe (diff) | |
| parent | c2a20ff0a87f58b2be66f067b0024db7ff5185d3 (diff) | |
| download | android_packages_apps_Trebuchet-c9b6d8432837c578b602a0d779bc425db27cb42e.tar.gz android_packages_apps_Trebuchet-c9b6d8432837c578b602a0d779bc425db27cb42e.tar.bz2 android_packages_apps_Trebuchet-c9b6d8432837c578b602a0d779bc425db27cb42e.zip | |
Merge "Consolidate all the dividers to provide same look and feel" into ub-launcher3-calgary
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 16 |
2 files changed, 5 insertions, 12 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index d411a4f47..937b2f05a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -35,6 +35,7 @@ <color name="quantum_panel_bg_color">#FFF5F5F5</color> <color name="outline_color">#FFFFFFFF</color> + <color name="all_apps_divider_color">#1E000000</color> <color name="spring_loaded_panel_color">#40FFFFFF</color> <color name="spring_loaded_highlighted_panel_border_color">#FFF</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index f3d0eaaa6..9abe3e601 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -58,7 +58,7 @@ <dimen name="container_min_margin">8dp</dimen> <dimen name="container_max_width">0dp</dimen> -<!-- All Apps --> + <!-- All Apps --> <dimen name="all_apps_button_scale_down">0dp</dimen> <dimen name="all_apps_grid_view_start_margin">0dp</dimen> <dimen name="all_apps_grid_section_y_offset">8dp</dimen> @@ -69,10 +69,7 @@ <dimen name="all_apps_search_bar_icon_margin_top">1dp</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 --> - <dimen name="all_apps_prediction_icon_top_padding">8dp</dimen> - <dimen name="all_apps_prediction_icon_bottom_padding">18dp</dimen> - <dimen name="all_apps_list_top_bottom_padding">8dp</dimen> + <dimen name="all_apps_list_bottom_padding">8dp</dimen> <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen> <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen> <dimen name="all_apps_background_canvas_width">700dp</dimen> @@ -83,13 +80,8 @@ <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> + <dimen name="all_apps_divider_height">1dp</dimen> + <dimen name="all_apps_divider_margin_vertical">8dp</dimen> <dimen name="all_apps_bezel_swipe_height">24dp</dimen> <!-- Widget tray --> |