summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorTony <twickham@google.com>2017-05-10 13:05:32 -0500
committerTony <twickham@google.com>2017-05-31 15:11:43 -0700
commitacaf5b3a37af11b40166c10e856175bb96cb1476 (patch)
treeb2e91e84ecad5863266da8dea058eea56779b037 /res/values
parentd5645d406bf50bd9c8004a597e29908b26d09925 (diff)
downloadandroid_packages_apps_Trebuchet-acaf5b3a37af11b40166c10e856175bb96cb1476.tar.gz
android_packages_apps_Trebuchet-acaf5b3a37af11b40166c10e856175bb96cb1476.tar.bz2
android_packages_apps_Trebuchet-acaf5b3a37af11b40166c10e856175bb96cb1476.zip
Remove gap between popup items
- Unround interior corners - Update colors (shortcuts are gray when next to notifications, notifications always white) - Clean up animation to animate entire popup with simple reveal instead of individual items animating with reveal and icon scale Bug: 35766387 Bug: 36110804 Change-Id: I33685d53e2db3904731676123dc230be4dabb5d4
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/config.xml7
-rw-r--r--res/values/dimens.xml1
3 files changed, 3 insertions, 7 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f4cd8c83e..6deffc139 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,7 +31,7 @@
<color name="spring_loaded_highlighted_panel_border_color">#FFF</color>
<!-- Popup container -->
- <color name="popup_header_background_color">#EEEEEE</color> <!-- Gray 200 -->
+ <color name="popup_header_background_color">#F5F5F5</color> <!-- Gray 100 -->
<color name="popup_background_color">#FFF</color>
<color name="notification_icon_default_color">#757575</color> <!-- Gray 600 -->
<color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->
diff --git a/res/values/config.xml b/res/values/config.xml
index 9b7c795cc..6df556b8d 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -124,11 +124,8 @@
<item type="id" name="preview_image_id" />
<!-- Popup items -->
- <integer name="config_deepShortcutOpenDuration">220</integer>
- <integer name="config_deepShortcutArrowOpenDuration">80</integer>
- <integer name="config_deepShortcutOpenStagger">40</integer>
- <integer name="config_deepShortcutCloseDuration">150</integer>
- <integer name="config_deepShortcutCloseStagger">20</integer>
+ <integer name="config_popupOpenCloseDuration">220</integer>
+ <integer name="config_popupArrowOpenDuration">80</integer>
<integer name="config_removeNotificationViewDuration">300</integer>
<!-- Accessibility actions -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 110e79042..3a531b08d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -148,7 +148,6 @@
<dimen name="deep_shortcuts_elevation">9dp</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>
<!-- an icon with shortcuts must be dragged this far before the container is removed. -->
<dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen>