summaryrefslogtreecommitdiffstats
path: root/res/values/dimens.xml
diff options
context:
space:
mode:
authorTony <twickham@google.com>2017-05-10 01:19:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-10 01:19:41 +0000
commite37d2b9f322d5a654f6089b90141a087ec484d72 (patch)
tree5ee402fcfee791ca79811f47dde3b1ab6d5a1b30 /res/values/dimens.xml
parent7588a8c391cd44722e397c0fa1dc9ae5a1017fbe (diff)
parent5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe (diff)
downloadandroid_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.zip
android_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.tar.gz
android_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.tar.bz2
Merge "Visual updates for popup" into ub-launcher3-dorval
am: 5cfde85cb6 Change-Id: I4e97cb52054b5c5ff467f3481b92730f6f9a3e8e
Diffstat (limited to 'res/values/dimens.xml')
-rw-r--r--res/values/dimens.xml32
1 files changed, 18 insertions, 14 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7dd9e53..6add64d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -154,7 +154,7 @@
<!-- Deep shortcuts -->
<dimen name="deep_shortcuts_elevation">9dp</dimen>
- <dimen name="bg_popup_item_width">208dp</dimen>
+ <dimen name="bg_popup_item_width">220dp</dimen>
<dimen name="bg_popup_item_height">56dp</dimen>
<dimen name="popup_items_spacing">4dp</dimen>
<dimen name="pre_drag_view_scale">6dp</dimen>
@@ -163,23 +163,27 @@
<dimen name="deep_shortcut_icon_size">36dp</dimen>
<dimen name="deep_shortcut_drawable_padding">8dp</dimen>
<dimen name="deep_shortcut_drag_handle_size">16dp</dimen>
- <dimen name="popup_padding_start">6dp</dimen>
+ <dimen name="popup_padding_start">10dp</dimen>
<dimen name="popup_padding_end">16dp</dimen>
<dimen name="popup_arrow_width">10dp</dimen>
<dimen name="popup_arrow_height">8dp</dimen>
<dimen name="popup_arrow_vertical_offset">-2dp</dimen>
<!-- popup_padding_start + deep_shortcut_icon_size / 2 -->
- <!-- Note that this works for right-aligned shortcuts, too, because
- popup_padding_end + deep_shortcut_drag_handle_size / 2 also equals 24dp-->
- <dimen name="popup_arrow_horizontal_center">24dp</dimen>
- <!-- popup_arrow_center - popup_arrow_width / 2-->
- <dimen name="popup_arrow_horizontal_offset">19dp</dimen>
+ <dimen name="popup_arrow_horizontal_center_start">28dp</dimen>
+ <!-- popup_padding_end + deep_shortcut_drag_handle_size / 2 -->
+ <dimen name="popup_arrow_horizontal_center_end">24dp</dimen>
+ <!-- popup_arrow_center_start - popup_arrow_width / 2-->
+ <dimen name="popup_arrow_horizontal_offset_start">23dp</dimen>
+ <!-- popup_arrow_center_end - popup_arrow_width / 2-->
+ <dimen name="popup_arrow_horizontal_offset_end">19dp</dimen>
<dimen name="popup_arrow_corner_radius">2dp</dimen>
- <!-- popup_item_width - icon_size - padding_start - drawable_padding -->
- <dimen name="deep_shortcuts_divider_width">158dp</dimen>
+ <!-- popup_padding_start + icon_size + 10dp -->
+ <dimen name="deep_shortcuts_text_padding_start">56dp</dimen>
+ <!-- popup_item_width - deep_shortcuts_text_padding_start -->
+ <dimen name="deep_shortcuts_divider_width">164dp</dimen>
<dimen name="system_shortcut_icon_size">24dp</dimen>
- <!-- popup_arrow_center - system_shortcut_icon_size / 2 -->
- <dimen name="system_shortcut_margin_start">12dp</dimen>
+ <!-- popup_arrow_center_start - system_shortcut_icon_size / 2 -->
+ <dimen name="system_shortcut_margin_start">16dp</dimen>
<dimen name="system_shortcut_header_height">40dp</dimen>
<dimen name="system_shortcut_header_icon_touch_size">48dp</dimen>
<!-- (touch_size - icon_size) / 2 -->
@@ -200,15 +204,15 @@
<dimen name="notification_footer_height">32dp</dimen>
<dimen name="notification_header_text_size">13sp</dimen>
<dimen name="notification_header_count_text_size">12sp</dimen>
- <dimen name="notification_main_text_size">15sp</dimen>
+ <dimen name="notification_main_text_size">14sp</dimen>
<dimen name="notification_icon_size">24dp</dimen>
<dimen name="notification_footer_icon_size">18dp</dimen>
<!-- notification_icon_size + notification_padding_end + 16dp padding between icon and text -->
<dimen name="notification_main_text_padding_end">52dp</dimen>
<dimen name="notification_elevation">2dp</dimen>
<dimen name="horizontal_ellipsis_size">18dp</dimen>
- <!-- arrow_horizontal_offset - (ellipsis_size - arrow_width) / 2 -->
- <dimen name="horizontal_ellipsis_offset">15dp</dimen>
+ <!-- arrow_horizontal_offset_start - (ellipsis_size - arrow_width) / 2 -->
+ <dimen name="horizontal_ellipsis_offset">19dp</dimen>
<dimen name="popup_item_divider_height">0.5dp</dimen>
<dimen name="swipe_helper_falsing_threshold">70dp</dimen>