diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 16:34:09 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 17:22:17 -0700 |
| commit | ea9ad5cead9ad894fb670476bb5381198cdcf2de (patch) | |
| tree | fcf23a25aadc660bd2dbb8b5178da454e8a00f08 /res/values/dimens.xml | |
| parent | 5845d3dbea53d513466c98b301eb49e96fe5d6a3 (diff) | |
| parent | 4abaf133546b0c950edc82594985e9da50d9c1dd (diff) | |
| download | android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.gz android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.bz2 android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.zip | |
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts:
Android.mk
Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 589d69666..36721797e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -55,9 +55,9 @@ <!-- Notes: container_bounds_inset - quantum_panel_outer_padding --> <dimen name="container_bounds_minus_quantum_panel_padding_inset">4dp</dimen> - <dimen name="container_fastscroll_thumb_min_width">4dp</dimen> - <dimen name="container_fastscroll_thumb_max_width">8dp</dimen> - <dimen name="container_fastscroll_thumb_height">64dp</dimen> + <dimen name="container_fastscroll_thumb_min_width">5dp</dimen> + <dimen name="container_fastscroll_thumb_max_width">9dp</dimen> + <dimen name="container_fastscroll_thumb_height">72dp</dimen> <dimen name="container_fastscroll_thumb_touch_inset">-24dp</dimen> <dimen name="container_fastscroll_popup_size">72dp</dimen> <dimen name="container_fastscroll_popup_text_size">48dp</dimen> @@ -74,6 +74,10 @@ <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_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> + <dimen name="all_apps_background_canvas_height">475dp</dimen> <!-- Widget tray --> <dimen name="widget_container_inset">8dp</dimen> @@ -129,4 +133,8 @@ <dimen name="blur_size_click_shadow">4dp</dimen> <dimen name="click_shadow_high_shift">2dp</dimen> +<!-- Pending widget --> + <dimen name="pending_widget_min_padding">8dp</dimen> + <dimen name="pending_widget_elevation">2dp</dimen> + </resources> |