am 254e8aea: Merge "Update for shortcuts" into mnc-dev

* commit '254e8aea22f36c90587315a58aeefda9683581eb': Update for shortcuts
2015-06-16 20:45:22 +00:00
parent 0d736b59d8 254e8aea22
commit fbebf8cfc4
4 changed files with 5 additions and 1 deletions
--- a/res/drawable-xxxhdpi/shortcut_base.png
+++ b/res/drawable-xxxhdpi/shortcut_base.png
--- a/res/layout/shortcut_badge.xml
+++ b/res/layout/shortcut_badge.xml
@@ -28,6 +28,7 @@
        android:id="@android:id/icon"
        android:layout_width="@dimen/shortcut_size"
        android:layout_height="@dimen/shortcut_size"
+        android:tint="@color/icon_accent"
        android:padding="12dp"
        android:scaleType="fitXY" />

--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -100,4 +100,7 @@

    <color name="zen_rule_name_warning">@color/system_warning_color</color>

+    <!-- Accent color that matches the settings launcher icon -->
+    <color name="icon_accent">#ffabffec</color>
+
 </resources>