diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-19 10:52:19 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-05-19 10:52:19 -0700 |
| commit | d5dbf617578506310e78b950b011dc3dbb5432ea (patch) | |
| tree | 8700d07437298811da705dbfbc02a8ca6052191d /res/values/colors.xml | |
| parent | 7056275771eeb3c8acbffd28192a0c6d3ed249c7 (diff) | |
| parent | 02aced978285c8a78eb98ee22130cf43017a4fa6 (diff) | |
| download | android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.tar.gz android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.tar.bz2 android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.zip | |
resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib44ce0130b9eb01c354f18326d7d3a1eeb2c5eb8
Diffstat (limited to 'res/values/colors.xml')
| -rw-r--r-- | res/values/colors.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 47bc5b568..f4cd8c83e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -35,6 +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> |