Update more colors in the People app UI.
Change-Id: I47c50fdc50760bcd05db32069da3d19a4d211f3d
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_dark.png b/res/drawable-hdpi/btn_star_off_normal_holo_dark.png
new file mode 100644
index 0000000..be0bf44
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_off_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
index cc17004..e285c66 100644
--- a/res/drawable-hdpi/btn_star_off_normal_holo_light.png
+++ b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_dark.png b/res/drawable-hdpi/btn_star_on_normal_holo_dark.png
new file mode 100644
index 0000000..452ceda
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_on_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
index ce97262..4b34e57 100644
--- a/res/drawable-hdpi/btn_star_on_normal_holo_light.png
+++ b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_holo_light.png b/res/drawable-hdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..c1953f5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_done_holo_light.png b/res/drawable-hdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..2c07476
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_dark.png b/res/drawable-mdpi/btn_star_off_normal_holo_dark.png
new file mode 100644
index 0000000..ac4db45
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_off_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
index 70483d9..3bb4154 100644
--- a/res/drawable-mdpi/btn_star_off_normal_holo_light.png
+++ b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_dark.png b/res/drawable-mdpi/btn_star_on_normal_holo_dark.png
new file mode 100644
index 0000000..40a0a31
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_on_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
index 3a52c18..4da97e2 100644
--- a/res/drawable-mdpi/btn_star_on_normal_holo_light.png
+++ b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_holo_light.png b/res/drawable-mdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..bdf035f
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_done_holo_light.png b/res/drawable-mdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..d18b783
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png b/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png
new file mode 100644
index 0000000..21a21d3
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
index ff718a7..e6048d9 100644
--- a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
+++ b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png b/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png
new file mode 100644
index 0000000..de66564
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
index 282145f..5588118 100644
--- a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
+++ b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_compose_holo_light.png b/res/drawable-xhdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..e18fca3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_done_holo_light.png b/res/drawable-xhdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..7cde3e5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/layout/editor_custom_action_bar.xml b/res/layout/editor_custom_action_bar.xml
index f2d6a30..e8d9287 100644
--- a/res/layout/editor_custom_action_bar.xml
+++ b/res/layout/editor_custom_action_bar.xml
@@ -44,7 +44,7 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="8dip"
android:layout_marginEnd="8dip"
- android:src="@drawable/ic_menu_done_holo_dark"
+ android:src="@drawable/ic_menu_done_holo_light"
android:description="@string/menu_done" />
<TextView
diff --git a/res/menu-sw600dp/view_contact.xml b/res/menu-sw600dp/view_contact.xml
index a2ff00d..5437dec 100644
--- a/res/menu-sw600dp/view_contact.xml
+++ b/res/menu-sw600dp/view_contact.xml
@@ -17,7 +17,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_edit"
- android:icon="@drawable/ic_menu_compose_holo_dark"
+ android:icon="@drawable/ic_menu_compose_holo_light"
android:title="@string/menu_editContact"
android:alphabeticShortcut="e"
android:showAsAction="always"/>
diff --git a/res/menu-sw600dp/view_group.xml b/res/menu-sw600dp/view_group.xml
index 3836c0f..b61588c 100644
--- a/res/menu-sw600dp/view_group.xml
+++ b/res/menu-sw600dp/view_group.xml
@@ -17,7 +17,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_edit_group"
- android:icon="@drawable/ic_menu_compose_holo_dark"
+ android:icon="@drawable/ic_menu_compose_holo_light"
android:title="@string/menu_editGroup"
android:alphabeticShortcut="e"
android:showAsAction="always" />
diff --git a/res/values-sw600dp-land/donottranslate_config.xml b/res/values-sw600dp-land/donottranslate_config.xml
index 5e5be30..fe09771 100644
--- a/res/values-sw600dp-land/donottranslate_config.xml
+++ b/res/values-sw600dp-land/donottranslate_config.xml
@@ -20,4 +20,5 @@
<resources>
<bool name="config_browse_list_show_images">true</bool>
<bool name="config_use_two_panes_in_favorites">true</bool>
+ <bool name="config_browse_list_reverse_images">false</bool>
</resources>
diff --git a/res/values-sw600dp/donottranslate_config.xml b/res/values-sw600dp/donottranslate_config.xml
index 406863e..a8d428c 100644
--- a/res/values-sw600dp/donottranslate_config.xml
+++ b/res/values-sw600dp/donottranslate_config.xml
@@ -22,6 +22,7 @@
<bool name="config_use_two_panes_in_favorites">false</bool>
<bool name="show_home_icon">true</bool>
<bool name="config_browse_list_show_images">false</bool>
+ <bool name="config_browse_list_reverse_images">false</bool>
<item name="tab_width_screen_width_percentage" type="fraction">66.67%</item>
<item name="tab_height_screen_width_percentage" type="fraction">66.67%</item>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 387012c..e59d6ee 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -16,6 +16,8 @@
<resources>
<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:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
<item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
@@ -27,9 +29,9 @@
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_item_divider">?android:attr/listDivider</item>
- <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_top">8dip</item>
<item name="list_item_padding_right">12dip</item>
- <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_bottom">8dip</item>
<item name="list_item_padding_left">0dip</item>
<item name="list_item_gap_between_image_and_text">8dip</item>
<item name="list_item_gap_between_label_and_data">5dip</item>
@@ -39,11 +41,11 @@
<item name="list_item_profile_photo_size">80dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
<item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_size">14sp</item>
- <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/main_header_separator_color</item>
+ <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_height">48dip</item>
+ <item name="list_item_header_underline_height">2dip</item>
+ <item name="list_item_header_underline_color">@color/secondary_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/people_app_theme_color</item>
@@ -62,9 +64,9 @@
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_item_divider">?android:attr/listDivider</item>
- <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_top">8dip</item>
<item name="list_item_padding_right">0dip</item>
- <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_bottom">8dip</item>
<item name="list_item_padding_left">0dip</item>
<item name="list_item_gap_between_image_and_text">8dip</item>
<item name="list_item_gap_between_label_and_data">5dip</item>
@@ -72,20 +74,21 @@
<item name="list_item_photo_size">64dip</item>
<item name="list_item_profile_photo_size">80dip</item>
<item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_size">14sp</item>
- <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/main_header_separator_color</item>
+ <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_height">48dip</item>
+ <item name="list_item_header_underline_height">2dip</item>
+ <item name="list_item_header_underline_color">@color/secondary_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/people_app_theme_color</item>
- <item name="list_item_contacts_count_text_size">12sp</item>
+ <item name="list_item_contacts_count_text_size">20sp</item>
<item name="contact_browser_list_padding_left">24dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
<item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
</style>
+
<style name="ContactPickerLayout" parent="ContactPickerTheme">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 4d35ad2..56442c2 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -16,6 +16,8 @@
<resources>
<style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<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:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
<item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
@@ -27,9 +29,9 @@
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_item_divider">?android:attr/listDivider</item>
- <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_top">8dip</item>
<item name="list_item_padding_right">24dip</item>
- <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_bottom">8dip</item>
<item name="list_item_padding_left">0dip</item>
<item name="list_item_gap_between_image_and_text">16dip</item>
<item name="list_item_gap_between_label_and_data">5dip</item>
@@ -39,11 +41,11 @@
<item name="list_item_profile_photo_size">80dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
<item name="list_item_header_text_indent">8dip</item>
- <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/main_header_separator_color</item>
- <item name="list_item_header_underline_height">1dip</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_height">48dip</item>
+ <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_underline_color">@color/secondary_header_separator_color</item>
+ <item name="list_item_header_underline_height">2dip</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>
diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index 3f5bff1..b74d8ce 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -22,6 +22,9 @@
<!-- Flag indicating whether to show images in browse list -->
<bool name="config_browse_list_show_images">true</bool>
+ <!-- Flag indicating whether to show images in browse list -->
+ <bool name="config_browse_list_reverse_images">true</bool>
+
<!-- If true, phonetic name is included in the contact editor by default -->
<bool name="config_editor_include_phonetic_name">false</bool>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d2ba9c1..c9c59e7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,9 +69,9 @@
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">24dip</item>
<item name="list_item_divider">?android:attr/listDivider</item>
- <item name="list_item_padding_top">0dip</item>
+ <item name="list_item_padding_top">8dip</item>
<item name="list_item_padding_right">0dip</item>
- <item name="list_item_padding_bottom">0dip</item>
+ <item name="list_item_padding_bottom">8dip</item>
<item name="list_item_padding_left">0dip</item>
<item name="list_item_gap_between_image_and_text">8dip</item>
<item name="list_item_gap_between_label_and_data">5dip</item>
@@ -80,16 +80,16 @@
<item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
- <item name="list_item_header_text_color">@color/people_app_theme_color</item>
- <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/main_header_separator_color</item>
+ <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
+ <item name="list_item_header_text_size">20sp</item>
+ <item name="list_item_header_height">48dip</item>
+ <item name="list_item_header_underline_height">2dip</item>
+ <item name="list_item_header_underline_color">@color/secondary_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/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_left">8dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
<item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
@@ -227,12 +227,12 @@
<style name="GroupMembershipSizeTextAppearance" parent="@android:style/TextAppearance.Small"/>
<style name="PeopleNavigationDropDownTextAppearance">
- <item name="android:textColor">#333333</item>
+ <item name="android:textColor">@color/primary_text_color</item>
<item name="android:textSize">18sp</item>
</style>
<style name="PeopleNavigationDropDownHeaderTextAppearance">
- <item name="android:textColor">#cdffffff</item>
+ <item name="android:textColor">@color/primary_text_color</item>
<item name="android:textSize">18sp</item>
</style>
diff --git a/src/com/android/contacts/detail/ContactDetailDisplayUtils.java b/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
index e07ae4c..c856f97 100644
--- a/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
+++ b/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
@@ -212,8 +212,8 @@
if (!isDirectoryEntry && !isUserProfile) {
starredMenuItem.setVisible(true);
final int resId = isStarred
- ? R.drawable.ic_menu_star_dk
- : R.drawable.ic_menu_star_lt;
+ ? R.drawable.btn_star_on_normal_holo_light
+ : R.drawable.btn_star_off_normal_holo_light;
starredMenuItem.setIcon(resId);
starredMenuItem.setChecked(isStarred);
starredMenuItem.setTitle(isStarred ? R.string.menu_removeStar : R.string.menu_addStar);
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 7e7e7a1..1f68dae 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -36,6 +36,7 @@
import com.android.contacts.common.list.ContactListAdapter;
import com.android.contacts.common.list.ContactListFilter;
import com.android.contacts.common.list.ContactListFilterController;
+import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.common.list.DefaultContactListAdapter;
import com.android.contacts.common.list.ProfileAndContactsLoader;
import com.android.contacts.editor.ContactEditorFragment;
@@ -92,7 +93,12 @@
protected ContactListAdapter createListAdapter() {
DefaultContactListAdapter adapter = new DefaultContactListAdapter(getContext());
adapter.setSectionHeaderDisplayEnabled(isSectionHeaderDisplayEnabled());
- adapter.setDisplayPhotos(getResources().getBoolean(R.bool.config_browse_list_show_images));
+ boolean showPhoto = getResources().getBoolean(R.bool.config_browse_list_show_images);
+ adapter.setDisplayPhotos(showPhoto);
+ if (showPhoto) {
+ boolean reverse = getResources().getBoolean(R.bool.config_browse_list_reverse_images);
+ adapter.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(reverse));
+ }
return adapter;
}
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index a5c269d..f3788a4 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -33,6 +33,7 @@
import com.android.contacts.R;
import com.android.contacts.common.list.ContactEntryListFragment;
+import com.android.contacts.common.list.ContactListItemView;
import com.android.contacts.list.JoinContactLoader.JoinContactLoaderResult;
/**
@@ -135,7 +136,9 @@
@Override
public JoinContactListAdapter createListAdapter() {
- return new JoinContactListAdapter(getActivity());
+ JoinContactListAdapter adapter = new JoinContactListAdapter(getActivity());
+ adapter.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(true /* opposite */));
+ return adapter;
}
@Override
