diff options
| author | Tony Wickham <twickham@google.com> | 2017-06-08 15:49:07 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-06-08 15:49:07 -0700 |
| commit | 0ecf5bcfcb329728231c2289f0ade8a0830860a9 (patch) | |
| tree | da17e72745e9cea493266ea5ee709b37387b9386 /res/values/colors.xml | |
| parent | 6d55202c9bf4e7181cf5a34772a070d4941b6de0 (diff) | |
| parent | 7092db02410562026da17a7b38f48025cc847de2 (diff) | |
| download | android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.tar.gz android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.tar.bz2 android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.zip | |
resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.x
Change-Id: I0f9ed3d42fcb04299c3c23d06629f855614c0538
Diffstat (limited to 'res/values/colors.xml')
| -rw-r--r-- | res/values/colors.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 9ac248a8e..52c61e71a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -33,6 +33,7 @@ <!-- Popup container --> <color name="notification_icon_default_color">#757575</color> <!-- Gray 600 --> <color name="badge_color">#1DE9B6</color> <!-- Teal A400 --> + <color name="folder_badge_color">#1DE9B6</color> <!-- Teal A400 --> <color name="icon_background">#E0E0E0</color> <!-- Gray 300 --> <color name="legacy_icon_background">#FFFFFF</color> |