summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-03-20 17:12:24 -0700
committerTony <twickham@google.com>2017-03-30 16:35:56 -0700
commit26b1746593851e239bfff65ae7a69b809ad87b99 (patch)
tree4f5a73f3253d52304a0f105aa03c2a882038b14a /res/values
parent4a907d0f9d1c80661c086aa95a8509698f38b324 (diff)
downloadandroid_packages_apps_Trebuchet-26b1746593851e239bfff65ae7a69b809ad87b99.tar.gz
android_packages_apps_Trebuchet-26b1746593851e239bfff65ae7a69b809ad87b99.tar.bz2
android_packages_apps_Trebuchet-26b1746593851e239bfff65ae7a69b809ad87b99.zip
Add support for system shortcuts in popup container
- Currently the system shortcuts are just widgets and app info - As shortcuts, they live in ShortcutsItemView - They are populated either as icons only (if there are deep shortcuts) or as icons + text - Widgets are disabled until binding them is complete (we request for them to be bound on long-press now). We should revisit this. Bug: 34940468 Change-Id: Ia51d002c3b3ede87658bdab57abfc3eeca1ed242
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml4
-rw-r--r--res/values/dimens.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 83a44d7b9..028c98206 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,10 +35,14 @@
<color name="spring_loaded_panel_color">#40FFFFFF</color>
<color name="spring_loaded_highlighted_panel_border_color">#FFF</color>
+ <!-- Notifications -->
<color name="notification_icon_default_color">#757575</color> <!-- Gray 600 -->
<color name="notification_header_background_color">#F5F5F5</color> <!-- Gray 100 -->
<color name="notification_background_color">#FFF</color>
<color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 -->
<color name="divider_color">@color/notification_color_beneath</color>
<color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
+
+ <!-- System shortcuts -->
+ <color name="system_shortcuts_icon_color">@android:color/tertiary_text_light</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 132ae0700..7b1d24720 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -172,6 +172,8 @@
<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>
+ <dimen name="system_shortcut_icon_size">28dp</dimen>
+ <dimen name="system_shortcut_padding_start">10dp</dimen>
<!-- Icon badges (with notification counts) -->
<dimen name="badge_size">24dp</dimen>