diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-03-07 23:46:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-07 23:46:54 +0000 |
| commit | 468922c84f439203218d961b8e35ccdc7be23b7b (patch) | |
| tree | d79635d0382aa63b7ca777bcbe57604cd7100ee2 | |
| parent | fee39c019284a614036bf9e035942747cd5bcb7e (diff) | |
| parent | 4f0f8bd8cf8509f4426e41d00c63e7302d7b882b (diff) | |
Merge "Added actionbar style elements from main Dialtacts theme to "CallDetailActivityTheme" to fix issue where Call Details action bar has wrong color."
| -rw-r--r-- | res/values/colors.xml | 9 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index e6fef3f05..2fb59ed81 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -57,10 +57,12 @@ <!-- Background color of dialer list items (contacts, call log entries) --> <color name="background_dialer_list_items">#eeeeee</color> - <!-- Background color of action bars --> + <!-- Background color of action bars. Ensure this stays in sync with packages/Telephony + actionbar_background_color. --> <color name="actionbar_background_color">#3B77E7</color> - <!-- Underline color of action bars --> + <!-- Underline color of action bars. Ensure this stays in sync with packages/Telephony + actionbar_underline. --> <color name="actionbar_underline">#3265C1</color> <!-- Color of the 1dp divider that separates favorites --> @@ -128,6 +130,7 @@ <!-- Color of the bottom border below the contacts grid on the main dialer screen. --> <color name="contacts_grid_bottom_border_color">#16000000</color> - <!-- Color of action bar text. --> + <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony + phone_settings_actionbar_text_color--> <color name="actionbar_text_color">#FFFFFF</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index e0fc1db96..207ab6bcc 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -95,6 +95,9 @@ <item name="android:windowBackground">@color/background_dialer_list_items</item> <item name="android:gravity">top</item> <item name="android:listViewStyle">@style/ListViewStyle</item> + <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item> + <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item> + <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item> <!-- CallLog --> <item name="call_log_primary_text_color">#333333</item> <item name="call_log_primary_background_color">#FFFFFF</item> |