commit 8aea3b185aa30085ab721be83aff81920d4be2d0
author Tony Wickham <twickham@google.com> Fri May 19 12:03:45 2017 -0700
committer Tony Wickham <twickham@google.com> Fri May 19 12:03:45 2017 -0700
tree e2451788a5bfc46dc2f0fb501588d9005d73728c
parent ecb6ade23bcfbf6f0ca18f8d15646c0edbe261cd
parent d5dbf617578506310e78b950b011dc3dbb5432ea

resolve merge conflicts of d5dbf6175 to ub-launcher3-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aefe84331c3236993bf23bd982d639b2ba2499e

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index c24ab3b..f4cd8c8 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,8 +35,8 @@
     <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 -->
-
     <color name="badge_color">#1DE9B6</color> <!-- Teal A400 -->
+    <color name="system_shortcuts_icon_color">@android:color/tertiary_text_light</color>
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
     <color name="legacy_icon_background">#FFFFFF</color>