diff options
Diffstat (limited to 'res')
44 files changed, 66 insertions, 155 deletions
diff --git a/res/drawable-hdpi/ab_solid_custom_blue_inverse_holo.9.png b/res/drawable-hdpi/ab_solid_custom_blue_inverse_holo.9.png Binary files differdeleted file mode 100644 index 956d61b46..000000000 --- a/res/drawable-hdpi/ab_solid_custom_blue_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ab_stacked_solid_inverse_holo.9.png b/res/drawable-hdpi/ab_stacked_solid_inverse_holo.9.png Binary files differdeleted file mode 100644 index 42528b157..000000000 --- a/res/drawable-hdpi/ab_stacked_solid_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_dark.png b/res/drawable-hdpi/btn_star_off_normal_holo_dark.png Binary files differdeleted file mode 100644 index 1ab75f9bd..000000000 --- a/res/drawable-hdpi/btn_star_off_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_dark.png b/res/drawable-hdpi/btn_star_on_normal_holo_dark.png Binary files differdeleted file mode 100644 index 8cd764a5e..000000000 --- a/res/drawable-hdpi/btn_star_on_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/list_section_divider_holo_custom.9.png b/res/drawable-hdpi/list_section_divider_holo_custom.9.png Binary files differindex 1e3e77893..a0f17568e 100644 --- a/res/drawable-hdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-hdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png b/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png Binary files differindex db386b4a7..569d28f54 100644 --- a/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png b/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png Binary files differindex 9236a42db..065ff62ce 100644 --- a/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png b/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png Binary files differindex cd7bc0d70..af5855420 100644 --- a/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable-mdpi/ab_solid_custom_blue_inverse_holo.9.png b/res/drawable-mdpi/ab_solid_custom_blue_inverse_holo.9.png Binary files differdeleted file mode 100644 index 3e9f16747..000000000 --- a/res/drawable-mdpi/ab_solid_custom_blue_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ab_stacked_solid_inverse_holo.9.png b/res/drawable-mdpi/ab_stacked_solid_inverse_holo.9.png Binary files differdeleted file mode 100644 index a823841c5..000000000 --- a/res/drawable-mdpi/ab_stacked_solid_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_dark.png b/res/drawable-mdpi/btn_star_off_normal_holo_dark.png Binary files differdeleted file mode 100644 index 069e1cac8..000000000 --- a/res/drawable-mdpi/btn_star_off_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_dark.png b/res/drawable-mdpi/btn_star_on_normal_holo_dark.png Binary files differdeleted file mode 100644 index d98dc9436..000000000 --- a/res/drawable-mdpi/btn_star_on_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/list_section_divider_holo_custom.9.png b/res/drawable-mdpi/list_section_divider_holo_custom.9.png Binary files differindex 1d8fd0904..1d9371de0 100644 --- a/res/drawable-mdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-mdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable-xhdpi/ab_solid_custom_blue_inverse_holo.9.png b/res/drawable-xhdpi/ab_solid_custom_blue_inverse_holo.9.png Binary files differdeleted file mode 100644 index 31fea59c2..000000000 --- a/res/drawable-xhdpi/ab_solid_custom_blue_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ab_stacked_solid_inverse_holo.9.png b/res/drawable-xhdpi/ab_stacked_solid_inverse_holo.9.png Binary files differdeleted file mode 100644 index 16b9bef12..000000000 --- a/res/drawable-xhdpi/ab_stacked_solid_inverse_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png b/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png Binary files differdeleted file mode 100644 index 3774545c6..000000000 --- a/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png b/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png Binary files differdeleted file mode 100644 index 11c557ce1..000000000 --- a/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png b/res/drawable-xhdpi/list_section_divider_holo_custom.9.png Binary files differindex 0bd8a0f22..8fb0636cf 100644 --- a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png +++ b/res/drawable-xhdpi/list_section_divider_holo_custom.9.png diff --git a/res/drawable/action_bar_item_background.xml b/res/drawable/action_bar_item_background.xml index 88857c470..2d964368a 100644 --- a/res/drawable/action_bar_item_background.xml +++ b/res/drawable/action_bar_item_background.xml @@ -17,5 +17,9 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/action_bar_item_pressed"/> <item android:state_focused="true" android:drawable="@drawable/action_bar_item_focused"/> - <item android:drawable="@android:color/transparent" /> + <item> + <shape android:shape="rectangle" > + <solid android:color="@color/action_bar_background" /> + </shape> + </item> </selector> diff --git a/res/drawable/action_bar_item_focused.xml b/res/drawable/action_bar_item_focused.xml index f34d99b82..13aeb4ced 100644 --- a/res/drawable/action_bar_item_focused.xml +++ b/res/drawable/action_bar_item_focused.xml @@ -16,20 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#27ffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - <item> - <shape android:shape="rectangle" > - <solid android:color="#00000000" /> - - <stroke - android:width="2dp" - android:color="#27ffffff" /> - </shape> - </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/action_bar_item_pressed.xml b/res/drawable/action_bar_item_pressed.xml index 784acc14b..13aeb4ced 100644 --- a/res/drawable/action_bar_item_pressed.xml +++ b/res/drawable/action_bar_item_pressed.xml @@ -16,11 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#4dffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml index 0af5e08e9..2fc5c2ba7 100644 --- a/res/drawable/action_bar_tab.xml +++ b/res/drawable/action_bar_tab.xml @@ -16,11 +16,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:drawable="@drawable/tab_selected_pressed" android:state_pressed="true" android:state_selected="true"/> - <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true" android:state_selected="true"/> - <item android:drawable="@drawable/tab_selected" android:state_selected="true"/> - <item android:drawable="@drawable/tab_unselected_pressed" android:state_pressed="true"/> - <item android:drawable="@drawable/tab_unselected_focused" android:state_focused="true"/> - + <item android:drawable="@drawable/tab_selected_pressed" android:state_pressed="true"/> + <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true"/> + <item android:drawable="@drawable/tab_selected" /> </selector>
\ No newline at end of file diff --git a/res/drawable/ic_tab_groups.xml b/res/drawable/ic_tab_groups.xml deleted file mode 100644 index c50c1f0b8..000000000 --- a/res/drawable/ic_tab_groups.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_groups_holo_dark" /> -</selector> - diff --git a/res/drawable/ic_tab_starred.xml b/res/drawable/ic_tab_starred.xml deleted file mode 100644 index ac93c4775..000000000 --- a/res/drawable/ic_tab_starred.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_ab_favourites_holo_dark" /> -</selector> - diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml index 5d57ea293..36a417543 100644 --- a/res/drawable/tab_selected.xml +++ b/res/drawable/tab_selected.xml @@ -16,16 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#ffffffff" /> + <solid android:color="@color/action_bar_background" /> </shape> </item> - <item android:bottom="6dp"> - <shape android:shape="rectangle" > - <solid android:color="@color/people_app_theme_color" /> - </shape> - </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml index 7a44ef55c..13aeb4ced 100644 --- a/res/drawable/tab_selected_focused.xml +++ b/res/drawable/tab_selected_focused.xml @@ -16,30 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - - <item> - <shape android:shape="rectangle" > - <solid android:color="#ffffffff" /> - </shape> - </item> - <item android:bottom="6dp"> - <shape android:shape="rectangle" > - <solid android:color="@color/people_app_theme_color" /> - </shape> - </item> <item> <shape android:shape="rectangle" > - <solid android:color="#27ffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - <item> - <shape android:shape="rectangle" > - <solid android:color="#00000000" /> - - <stroke - android:width="2dp" - android:color="#27ffffff" /> - </shape> - </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml index e3d9d26ce..13aeb4ced 100644 --- a/res/drawable/tab_selected_pressed.xml +++ b/res/drawable/tab_selected_pressed.xml @@ -16,21 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#ffffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - <item android:bottom="6dp"> - <shape android:shape="rectangle" > - <solid android:color="@color/people_app_theme_color" /> - </shape> - </item> - <item> - <shape android:shape="rectangle" > - <solid android:color="#4dffffff" /> - </shape> - </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml index f34d99b82..13aeb4ced 100644 --- a/res/drawable/tab_unselected_focused.xml +++ b/res/drawable/tab_unselected_focused.xml @@ -16,20 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#27ffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - <item> - <shape android:shape="rectangle" > - <solid android:color="#00000000" /> - - <stroke - android:width="2dp" - android:color="#27ffffff" /> - </shape> - </item> - </layer-list>
\ No newline at end of file diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml index 784acc14b..13aeb4ced 100644 --- a/res/drawable/tab_unselected_pressed.xml +++ b/res/drawable/tab_unselected_pressed.xml @@ -16,11 +16,9 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > - <item> <shape android:shape="rectangle" > - <solid android:color="#4dffffff" /> + <solid android:color="@color/action_bar_background_highlight" /> </shape> </item> - </layer-list>
\ No newline at end of file diff --git a/res/layout-sw600dp/contact_picker.xml b/res/layout-sw600dp/contact_picker.xml index adcfd920c..558c604e5 100644 --- a/res/layout-sw600dp/contact_picker.xml +++ b/res/layout-sw600dp/contact_picker.xml @@ -73,7 +73,7 @@ android:duplicateParentState="true" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/action_bar_button_text_color" - style="@android:style/Widget.Holo.ActionBar.TabText" + style="@android:style/Widget.Holo.Light.ActionBar.TabText" android:text="@string/pickerNewContactText"/> </LinearLayout> </LinearLayout> diff --git a/res/layout/confirm_add_detail_activity.xml b/res/layout/confirm_add_detail_activity.xml index 650ca2fb8..8826b626b 100644 --- a/res/layout/confirm_add_detail_activity.xml +++ b/res/layout/confirm_add_detail_activity.xml @@ -133,7 +133,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dip" - android:background="?android:attr/listDivider"/> + android:background="@color/secondary_header_separator_color"/> <!-- Action buttons --> <LinearLayout diff --git a/res/layout/editor_custom_action_bar.xml b/res/layout/editor_custom_action_bar.xml index 17ab5128f..f2d6a30e8 100644 --- a/res/layout/editor_custom_action_bar.xml +++ b/res/layout/editor_custom_action_bar.xml @@ -54,7 +54,7 @@ android:layout_marginRight="20dip" android:layout_marginEnd="20dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/action_bar_button_text_color" + android:textColor="@color/people_app_theme_color" android:text="@string/menu_done" style="@android:style/Widget.Holo.ActionBar.TabText" /> diff --git a/res/layout/group_account_header_horizontal.xml b/res/layout/group_account_header_horizontal.xml index 834998bf4..4173fa49c 100644 --- a/res/layout/group_account_header_horizontal.xml +++ b/res/layout/group_account_header_horizontal.xml @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:textColor="@color/contact_count_text_color" + android:textColor="@color/people_app_theme_color" android:textSize="12sp" android:singleLine="true" android:ellipsize="middle" diff --git a/res/layout/group_account_header_vertical.xml b/res/layout/group_account_header_vertical.xml index 0b3b6819b..289d23aa8 100644 --- a/res/layout/group_account_header_vertical.xml +++ b/res/layout/group_account_header_vertical.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:paddingLeft="?attr/list_item_header_text_indent" android:paddingStart="?attr/list_item_header_text_indent" - android:textColor="@color/contact_count_text_color" + android:textColor="@color/people_app_theme_color" android:textSize="12sp" android:singleLine="true" android:ellipsize="middle" /> diff --git a/res/layout/group_browse_list_item.xml b/res/layout/group_browse_list_item.xml index e1c6b2869..92e36a4a2 100644 --- a/res/layout/group_browse_list_item.xml +++ b/res/layout/group_browse_list_item.xml @@ -42,7 +42,7 @@ android:layout_height="1dip" android:layout_marginRight="?attr/list_item_padding_right" android:layout_marginEnd="?attr/list_item_padding_right" - android:background="?android:attr/listDivider" /> + android:background="@color/secondary_header_separator_color" /> <include android:id="@+id/group_list_header" diff --git a/res/layout/item_read_only_field.xml b/res/layout/item_read_only_field.xml index ae8e3d1d1..d4ae17915 100644 --- a/res/layout/item_read_only_field.xml +++ b/res/layout/item_read_only_field.xml @@ -33,7 +33,7 @@ android:layout_marginRight="8dip" android:layout_marginStart="8dip" android:layout_marginEnd="8dip" - android:background="?android:attr/listDivider" /> + android:background="@color/secondary_header_separator_color" /> <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml index ace310665..56ec894ef 100644 --- a/res/layout/user_profile_header.xml +++ b/res/layout/user_profile_header.xml @@ -51,6 +51,6 @@ android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="12sp" - android:textColor="@color/contact_count_text_color" /> + android:textColor="@color/people_app_theme_color" /> </LinearLayout> diff --git a/res/menu-sw600dp/people_options.xml b/res/menu-sw600dp/people_options.xml index aaf89886b..891c1b464 100644 --- a/res/menu-sw600dp/people_options.xml +++ b/res/menu-sw600dp/people_options.xml @@ -16,19 +16,19 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/menu_search" - android:icon="@drawable/ic_ab_search_holo_dark" + android:icon="@drawable/ic_search_dk" android:title="@string/menu_search" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_add_contact" - android:icon="@drawable/ic_add_contact_holo_dark" + android:icon="@drawable/ic_add_person_dk" android:title="@string/menu_new_contact_action_bar" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_add_group" - android:icon="@drawable/ic_add_group_holo_dark" + android:icon="@drawable/ic_add_person_dk" android:title="@string/menu_new_group_action_bar" android:showAsAction="ifRoom" /> diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml index 2b3c9185f..1ba06f236 100644 --- a/res/menu/people_options.xml +++ b/res/menu/people_options.xml @@ -16,19 +16,19 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/menu_search" - android:icon="@drawable/ic_ab_search_holo_dark" + android:icon="@drawable/ic_search_dk" android:title="@string/menu_search" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_add_contact" - android:icon="@drawable/ic_add_contact_holo_dark" + android:icon="@drawable/ic_add_person_dk" android:title="@string/menu_new_contact_action_bar" android:showAsAction="ifRoom" /> <item android:id="@+id/menu_add_group" - android:icon="@drawable/ic_add_group_holo_dark" + android:icon="@drawable/ic_add_person_dk" android:title="@string/menu_new_group_action_bar" android:showAsAction="ifRoom" /> diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml index 9efb20b96..c2f2ab86a 100644 --- a/res/values-sw600dp-land/styles.xml +++ b/res/values-sw600dp-land/styles.xml @@ -43,10 +43,10 @@ <item name="list_item_header_text_color">@color/people_app_theme_color</item> <item name="list_item_header_height">32dip</item> <item name="list_item_header_underline_height">1dip</item> - <item name="list_item_header_underline_color">@color/people_app_theme_color</item> + <item name="list_item_header_underline_color">@color/main_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> - <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item> + <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_contacts_count_text_size">12sp</item> <item name="contact_browser_list_padding_left">0dip</item> <item name="contact_browser_list_padding_right">0dip</item> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 3d919d63d..387012cb2 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources> - <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> + <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light"> <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item> <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item> <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item> @@ -43,10 +43,10 @@ <item name="list_item_header_text_color">@color/people_app_theme_color</item> <item name="list_item_header_height">32dip</item> <item name="list_item_header_underline_height">1dip</item> - <item name="list_item_header_underline_color">@color/people_app_theme_color</item> + <item name="list_item_header_underline_color">@color/main_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> - <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item> + <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_contacts_count_text_size">12sp</item> <item name="contact_browser_list_padding_left">0dip</item> <item name="contact_browser_list_padding_right">0dip</item> @@ -76,10 +76,10 @@ <item name="list_item_header_text_color">@color/people_app_theme_color</item> <item name="list_item_header_height">24dip</item> <item name="list_item_header_underline_height">1dip</item> - <item name="list_item_header_underline_color">@color/people_app_theme_color</item> + <item name="list_item_header_underline_color">@color/main_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> - <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item> + <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_contacts_count_text_size">12sp</item> <item name="contact_browser_list_padding_left">24dip</item> <item name="contact_browser_list_padding_right">0dip</item> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index d84c76a63..4d35ad2d7 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -42,9 +42,9 @@ <item name="list_item_header_text_color">@color/people_app_theme_color</item> <item name="list_item_header_height">32dip</item> <item name="list_item_header_text_size">14sp</item> - <item name="list_item_header_underline_color">@color/people_app_theme_color</item> + <item name="list_item_header_underline_color">@color/main_header_separator_color</item> <item name="list_item_header_underline_height">1dip</item> - <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item> + <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_contacts_count_text_size">12sp</item> <item name="contact_browser_list_padding_left">0dip</item> <item name="contact_browser_list_padding_right">0dip</item> diff --git a/res/values/colors.xml b/res/values/colors.xml index 282c89fa5..362001da0 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,12 +23,12 @@ <color name="quickcontact_name_detail_background">#66000000</color> <!-- Color of the background of the contact detail and editor pages --> - <color name="background_primary">#FFFFFF</color> + <color name="background_primary">#f5f5f5</color> <color name="background_social_updates">#ffeeeeee</color> <!-- Color used for the letter in the A-Z section header --> - <color name="section_header_text_color">#ff999999</color> + <color name="section_header_text_color">#363636</color> <!-- Color of the text in the updates tab in the tab carousel on the contact detail page --> <color name="detail_update_tab_text_color">#777777</color> @@ -36,6 +36,12 @@ <!-- Color of the text of the tab carousel in the contact details --> <color name="detail_tab_carousel_tab_label_color">#EEEEEE</color> + <!-- Color of the background of the action bar --> + <color name="action_bar_background">#e6e6e6</color> + + <!-- Color of the background of the action bar when highlighted (ie. pressed, focused) --> + <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> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6e5cbf9cd..d2ba9c14b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,8 +15,10 @@ --> <resources> - <style name="DetailActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> + <style name="DetailActivityTheme" parent="@android:style/Theme.Holo.Light"> <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item> + <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item> + <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item> <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item> <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item> <item name="android:textColorPrimary">@color/primary_text_color</item> @@ -24,8 +26,10 @@ <item name="android:listViewStyle">@style/ListViewStyle</item> </style> - <style name="EditorActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> + <style name="EditorActivityTheme" parent="@android:style/Theme.Holo.Light"> <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item> + <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item> + <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item> <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item> <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item> <item name="android:windowContentOverlay">@null</item> @@ -49,8 +53,10 @@ <item name="android:listViewStyle">@style/ListViewStyle</item> </style> - <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> + <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light"> <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item> + <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item> + <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item> <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item> <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item> <item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item> @@ -78,10 +84,10 @@ <item name="list_item_header_text_size">14sp</item> <item name="list_item_header_height">32dip</item> <item name="list_item_header_underline_height">1dip</item> - <item name="list_item_header_underline_color">@color/people_app_theme_color</item> + <item name="list_item_header_underline_color">@color/main_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> - <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item> + <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_header_text_indent">8dip</item> <item name="contact_browser_list_padding_left">16dip</item> <item name="contact_browser_list_padding_right">0dip</item> @@ -92,9 +98,14 @@ <item name="favorites_padding_bottom">0dip</item> </style> - <style name="ContactsActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> - <item name="android:background">@drawable/ab_solid_custom_blue_inverse_holo</item> - <item name="android:backgroundStacked">@drawable/ab_solid_custom_blue_inverse_holo</item> + <style name="ContactsActionBarOverflow" parent="@android:style/Widget.Holo.ActionButton.Overflow"> + <item name="android:src">@drawable/ic_overflow_menu</item> + </style> + + <style name="ContactsActionBarStyle" parent="@android:Widget.Holo.Light.ActionBar"> + <item name="android:background">@drawable/action_bar_tab</item> + <item name="android:backgroundSplit">@drawable/action_bar_tab</item> + <item name="android:backgroundStacked">@drawable/action_bar_tab</item> <item name="android:displayOptions"></item> </style> @@ -102,7 +113,7 @@ <item name="android:background">@drawable/ab_dropdown_navigation_item_background</item> </style> - <style name="ContactsActionBarTheme" parent="@android:style/Theme.Holo"> + <style name="ContactsActionBarTheme" parent="@android:style/Theme.Holo.Light"> <item name="android:textColorHint">#CCCCCC</item> <item name="android:textColor">@android:color/black</item> <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item> |
