Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b8b2244 authored by Brian Attwell's avatar Brian Attwell Committed by Android Git Automerger
Browse files

am 3e4e8d71: Merge "Update primary & primaryDark contact colors" into lmp-dev

* commit '3e4e8d71':
  Update primary & primaryDark contact colors
parents 14feca55 3e4e8d71
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -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>

+2 −2
Original line number Diff line number Diff line
@@ -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>