Merge "Update primary & primaryDark contact colors" into lmp-dev
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8f6e022..84ecea0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,18 +24,17 @@
<color name="background_social_updates">#ffeeeeee</color>
- <!-- Color of the background of the action bar -->
- <color name="action_bar_background">#e6e6e6</color>
-
- <!-- Color used for system bar and navigation bar. -->
- <color name="primary_dark">#008aa1</color>
-
- <!-- Color of the background of the action bar when highlighted (ie. pressed, focused) -->
+ <!-- TODO: remove these colors once we delete the group code (b/16522929) -->
+ <color name="action_bar_background">#0288d1</color>
<color name="action_bar_background_highlight">#cecece</color>
-
- <!-- Color of the text for buttons in the action bar -->
<color name="action_bar_button_text_color">#FFFFFF</color>
+ <color name="actionbar_background_color">@color/primary_color</color>
+ <color name="actionbar_background_color_dark">@color/primary_color_dark</color>
+
+ <color name="primary_color_dark">#0277bd</color>
+ <color name="primary_color">#0288d1</color>
+
<!-- Color of the selected tab underline (overriding value in ContactsCommon) -->
<color name="contacts_accent_color">#00acc1</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 37d0c94..12fafbc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -64,8 +64,8 @@
<item name="android:icon">@android:color/transparent</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:windowBackground">@color/background_primary</item>
- <item name="android:colorPrimaryDark">@color/primary_dark</item>
- <item name="android:colorPrimary">@color/actionbar_background_color</item>
+ <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
+ <item name="android:colorPrimary">@color/primary_color</item>
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>