diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-04-11 17:26:50 -0700 |
| commit | bb3c1f8f7c4331a50e57cf1e243a318d8bc82172 (patch) | |
| tree | d736721f562fa5f56064e445e89574c50144553d /res/values/colors.xml | |
| parent | 7fc94d7aacddb12e6d50401314fdc029d20939a6 (diff) | |
| parent | ce44516dd869dff1d6a744e26625a662d9567a10 (diff) | |
| download | android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.gz android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.tar.bz2 android_packages_apps_Trebuchet-bb3c1f8f7c4331a50e57cf1e243a318d8bc82172.zip | |
resolve merge conflicts of ce44516dd to ub-launcher3-master
Change-Id: I6f4455c1d4bedf778850acbb1e1c7372d532e13a
Diffstat (limited to 'res/values/colors.xml')
| -rw-r--r-- | res/values/colors.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index cc78b4136..ddf451f72 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,13 +32,14 @@ <!-- Notifications --> <color name="notification_icon_default_color">#757575</color> <!-- Gray 600 --> - <color name="notification_header_background_color">#F5F5F5</color> <!-- Gray 100 --> + <color name="notification_header_background_color">#EEEEEE</color> <!-- Gray 200 --> <color name="notification_background_color">#FFF</color> <color name="notification_color_beneath">#E0E0E0</color> <!-- Gray 300 --> <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> + + <color name="icon_background">#E0E0E0</color> <!-- Gray 300 --> + <color name="legacy_icon_background">#FFFFFF</color> </resources> |