diff options
| author | Tony Wickham <twickham@google.com> | 2017-02-27 16:30:47 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-03-01 10:16:16 -0800 |
| commit | 51889b0be83dc34c9752fc066d0d6e75ab4f5e26 (patch) | |
| tree | b3c466ce4742e561fc19dce1a1a028a65f28801b /res/values/dimens.xml | |
| parent | 7f3526a1a4d5d3578d4648abb1422646d23c6080 (diff) | |
| download | android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.gz android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.bz2 android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.zip | |
Merge deep shortcuts in rounded rect
- DeepShortcutViews are added to ShortcutsItemView, which
is in PopupContainerWithArrow
- Moved some shortcut-specific logic to ShortcutsItemView
(namely, touch/long-click handling for draggin shortcuts)
- Moved round-rect clipping to PopupItemView
- Removed collapseToIcon() logic, including
PillWidthRevealOutlineProvider, which was only used for
that purpose. It isn't necessary now that the deep
shortcuts have no background themselves.
- Replaced focus pill drawable with ripple effect on
shortcuts and notification view.
Bug: 35766387
Change-Id: I6bc09f1851cfbb806df4bf75a6e435b0f1900c9c
Diffstat (limited to 'res/values/dimens.xml')
| -rw-r--r-- | res/values/dimens.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 177e08e2f..8fee26b0b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -150,10 +150,9 @@ <!-- Deep shortcuts --> <dimen name="deep_shortcuts_elevation">9dp</dimen> - <dimen name="bg_pill_width">208dp</dimen> - <dimen name="bg_pill_height">48dp</dimen> - <dimen name="bg_pill_radius">24dp</dimen> - <dimen name="deep_shortcuts_spacing">4dp</dimen> + <dimen name="bg_popup_item_width">208dp</dimen> + <dimen name="bg_popup_item_height">48dp</dimen> + <dimen name="popup_items_spacing">4dp</dimen> <dimen name="pre_drag_view_scale">6dp</dimen> <!-- an icon with shortcuts must be dragged this far before the container is removed. --> <dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen> @@ -171,6 +170,8 @@ deep_shortcut_padding_end + deep_shortcut_drag_handle_size / 2 - deep_shortcuts_arrow_width / 2 also happens to equal 19dp--> <dimen name="deep_shortcuts_arrow_horizontal_offset">19dp</dimen> + <!-- popup_item_width - icon_size - padding_start - drawable_padding --> + <dimen name="deep_shortcuts_divider_width">158dp</dimen> <!-- Icon badges (with notification counts) --> <dimen name="badge_size">24dp</dimen> @@ -186,9 +187,9 @@ <!-- (icon_size - footer_icon_size) / 2 --> <dimen name="notification_footer_icon_row_padding">2dp</dimen> <dimen name="notification_main_height">60dp</dimen> - <dimen name="notification_footer_height">@dimen/bg_pill_height</dimen> + <dimen name="notification_footer_height">@dimen/bg_popup_item_height</dimen> <dimen name="notification_elevation">2dp</dimen> - <dimen name="notification_divider_height">0.5dp</dimen> + <dimen name="popup_item_divider_height">0.5dp</dimen> <dimen name="swipe_helper_falsing_threshold">70dp</dimen> <!-- Other --> |