diff options
| author | Tony <twickham@google.com> | 2017-03-30 18:10:05 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2017-03-30 18:10:05 -0700 |
| commit | ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d (patch) | |
| tree | 26607083342c958c73614d11e0dd4935005fc4b4 /res/values/colors.xml | |
| parent | 917f4a44cb221ac51784e0bfde3a90e0e73bc46d (diff) | |
| parent | 26b1746593851e239bfff65ae7a69b809ad87b99 (diff) | |
| download | android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.tar.gz android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.tar.bz2 android_packages_apps_Trebuchet-ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d.zip | |
resolve merge conflicts of 26b174659 to ub-launcher3-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728
Diffstat (limited to 'res/values/colors.xml')
| -rw-r--r-- | res/values/colors.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 455729c42..cc78b4136 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -30,6 +30,7 @@ <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> @@ -37,4 +38,7 @@ <color name="divider_color">@color/notification_color_beneath</color> <color name="icon_background">#E0E0E0</color> <!-- Gray 300 --> <color name="legacy_icon_background">#FFFFFF</color> + + <!-- System shortcuts --> + <color name="system_shortcuts_icon_color">@android:color/tertiary_text_light</color> </resources> |