Merge "Use default-corp photos in QC for corps" into lmp-dev
diff --git a/res/drawable-hdpi/bg_people_updates_holo.9.png b/res/drawable-hdpi/bg_people_updates_holo.9.png
deleted file mode 100644
index bce6226..0000000
--- a/res/drawable-hdpi/bg_people_updates_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bg_status_contact_widget.9.png b/res/drawable-hdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index f73c005..0000000
--- a/res/drawable-hdpi/bg_status_contact_widget.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_dark.png b/res/drawable-hdpi/btn_star_off_normal_holo_dark.png
deleted file mode 100644
index be0bf44..0000000
--- a/res/drawable-hdpi/btn_star_off_normal_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 452ceda..0000000
--- a/res/drawable-hdpi/btn_star_on_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/contacts_widget_preview.png b/res/drawable-hdpi/contacts_widget_preview.png
deleted file mode 100644
index 8156317..0000000
--- a/res/drawable-hdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/divider_vertical_dark.9.png b/res/drawable-hdpi/divider_vertical_dark.9.png
deleted file mode 100644
index 702b878..0000000
--- a/res/drawable-hdpi/divider_vertical_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_ab_favourites_holo_dark.png b/res/drawable-hdpi/ic_ab_favourites_holo_dark.png
deleted file mode 100644
index 7c76734..0000000
--- a/res/drawable-hdpi/ic_ab_favourites_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_add_group_dk.png b/res/drawable-hdpi/ic_add_group_dk.png
deleted file mode 100644
index 89be0ac..0000000
--- a/res/drawable-hdpi/ic_add_group_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_favorite_off_lt.png b/res/drawable-hdpi/ic_favorite_off_lt.png
deleted file mode 100644
index 54f57a6..0000000
--- a/res/drawable-hdpi/ic_favorite_off_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_favorite_on_lt.png b/res/drawable-hdpi/ic_favorite_on_lt.png
deleted file mode 100644
index a3c5ed5..0000000
--- a/res/drawable-hdpi/ic_favorite_on_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_groups_holo_dark.png b/res/drawable-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 32f419c..0000000
--- a/res/drawable-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_field_holo_light.png b/res/drawable-hdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index 4ef604a..0000000
--- a/res/drawable-hdpi/ic_menu_add_field_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_holo_dark.png b/res/drawable-hdpi/ic_menu_compose_holo_dark.png
deleted file mode 100644
index 2df1f44..0000000
--- a/res/drawable-hdpi/ic_menu_compose_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index c1953f5..0000000
--- a/res/drawable-hdpi/ic_menu_compose_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_pressed_holo_light.9.png b/res/drawable-hdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 2054530..0000000
--- a/res/drawable-hdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_section_divider_holo_custom.9.png b/res/drawable-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index a0f1756..0000000
--- a/res/drawable-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/panel_favorites_holo_light.9.png b/res/drawable-hdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index effe70c..0000000
--- a/res/drawable-hdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickcon_background_texture.png b/res/drawable-hdpi/quickcon_background_texture.png
deleted file mode 100644
index faade82..0000000
--- a/res/drawable-hdpi/quickcon_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/bg_status_contact_widget.9.png b/res/drawable-ldrtl-hdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index c8b6e19..0000000
--- a/res/drawable-ldrtl-hdpi/bg_status_contact_widget.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/contacts_widget_preview.png b/res/drawable-ldrtl-hdpi/contacts_widget_preview.png
deleted file mode 100644
index dc47862..0000000
--- a/res/drawable-ldrtl-hdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 569d28f..0000000
--- a/res/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/panel_favorites_holo_light.9.png b/res/drawable-ldrtl-hdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index a948d10..0000000
--- a/res/drawable-ldrtl-hdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/bg_status_contact_widget.9.png b/res/drawable-ldrtl-mdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index 8041b23..0000000
--- a/res/drawable-ldrtl-mdpi/bg_status_contact_widget.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/contacts_widget_preview.png b/res/drawable-ldrtl-mdpi/contacts_widget_preview.png
deleted file mode 100644
index 0954fbc..0000000
--- a/res/drawable-ldrtl-mdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 065ff62..0000000
--- a/res/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/panel_favorites_holo_light.9.png b/res/drawable-ldrtl-mdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index aec2268..0000000
--- a/res/drawable-ldrtl-mdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/bg_status_contact_widget.9.png b/res/drawable-ldrtl-xhdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index 84241a9..0000000
--- a/res/drawable-ldrtl-xhdpi/bg_status_contact_widget.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/contacts_widget_preview.png b/res/drawable-ldrtl-xhdpi/contacts_widget_preview.png
deleted file mode 100644
index 0c986b6..0000000
--- a/res/drawable-ldrtl-xhdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index af58554..0000000
--- a/res/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/panel_favorites_holo_light.9.png b/res/drawable-ldrtl-xhdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index 05c8342..0000000
--- a/res/drawable-ldrtl-xhdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_people_updates_holo.9.png b/res/drawable-mdpi/bg_people_updates_holo.9.png
deleted file mode 100644
index 6bd1dc0..0000000
--- a/res/drawable-mdpi/bg_people_updates_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_status_contact_widget.9.png b/res/drawable-mdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index 99e5d6e..0000000
--- a/res/drawable-mdpi/bg_status_contact_widget.9.png
+++ /dev/null
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
deleted file mode 100644
index ac4db45..0000000
--- a/res/drawable-mdpi/btn_star_off_normal_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 40a0a31..0000000
--- a/res/drawable-mdpi/btn_star_on_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/contacts_widget_preview.png b/res/drawable-mdpi/contacts_widget_preview.png
deleted file mode 100644
index 6cf6d43..0000000
--- a/res/drawable-mdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/divider_vertical_dark.9.png b/res/drawable-mdpi/divider_vertical_dark.9.png
deleted file mode 100644
index 702b878..0000000
--- a/res/drawable-mdpi/divider_vertical_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_ab_favourites_holo_dark.png b/res/drawable-mdpi/ic_ab_favourites_holo_dark.png
deleted file mode 100644
index 1a87953..0000000
--- a/res/drawable-mdpi/ic_ab_favourites_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_group_dk.png b/res/drawable-mdpi/ic_add_group_dk.png
deleted file mode 100644
index 2b24b3e..0000000
--- a/res/drawable-mdpi/ic_add_group_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_off_lt.png b/res/drawable-mdpi/ic_favorite_off_lt.png
deleted file mode 100644
index ce8c460..0000000
--- a/res/drawable-mdpi/ic_favorite_off_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_on_lt.png b/res/drawable-mdpi/ic_favorite_on_lt.png
deleted file mode 100644
index 4a5aed3..0000000
--- a/res/drawable-mdpi/ic_favorite_on_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_groups_holo_dark.png b/res/drawable-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index c3cf14a..0000000
--- a/res/drawable-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_field_holo_light.png b/res/drawable-mdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index fbb1a7a..0000000
--- a/res/drawable-mdpi/ic_menu_add_field_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_holo_dark.png b/res/drawable-mdpi/ic_menu_compose_holo_dark.png
deleted file mode 100644
index 3caf754..0000000
--- a/res/drawable-mdpi/ic_menu_compose_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index bdf035f..0000000
--- a/res/drawable-mdpi/ic_menu_compose_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_pressed_holo_light.9.png b/res/drawable-mdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 061904c..0000000
--- a/res/drawable-mdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_section_divider_holo_custom.9.png b/res/drawable-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 1d9371d..0000000
--- a/res/drawable-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/panel_favorites_holo_light.9.png b/res/drawable-mdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index fb76aa7..0000000
--- a/res/drawable-mdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickcon_background_texture.png b/res/drawable-mdpi/quickcon_background_texture.png
deleted file mode 100644
index 7148ea7..0000000
--- a/res/drawable-mdpi/quickcon_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/contacts_widget_preview.png b/res/drawable-nodpi/contacts_widget_preview.png
deleted file mode 100755
index 86c3042..0000000
--- a/res/drawable-nodpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/divider_vertical_dark.9.png b/res/drawable-sw600dp-nodpi/divider_vertical_dark.9.png
deleted file mode 100644
index 38b794b..0000000
--- a/res/drawable-sw600dp-nodpi/divider_vertical_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bg_people_updates_holo.9.png b/res/drawable-xhdpi/bg_people_updates_holo.9.png
deleted file mode 100644
index 1386238..0000000
--- a/res/drawable-xhdpi/bg_people_updates_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/bg_status_contact_widget.9.png b/res/drawable-xhdpi/bg_status_contact_widget.9.png
deleted file mode 100644
index de5d9d2..0000000
--- a/res/drawable-xhdpi/bg_status_contact_widget.9.png
+++ /dev/null
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
deleted file mode 100644
index 21a21d3..0000000
--- a/res/drawable-xhdpi/btn_star_off_normal_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index de66564..0000000
--- a/res/drawable-xhdpi/btn_star_on_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/contacts_widget_preview.png b/res/drawable-xhdpi/contacts_widget_preview.png
deleted file mode 100644
index 407c3c3..0000000
--- a/res/drawable-xhdpi/contacts_widget_preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ab_favourites_holo_dark.png b/res/drawable-xhdpi/ic_ab_favourites_holo_dark.png
deleted file mode 100644
index 24774a5..0000000
--- a/res/drawable-xhdpi/ic_ab_favourites_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_group_dk.png b/res/drawable-xhdpi/ic_add_group_dk.png
deleted file mode 100644
index b8cc55f..0000000
--- a/res/drawable-xhdpi/ic_add_group_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_favorite_off_lt.png b/res/drawable-xhdpi/ic_favorite_off_lt.png
deleted file mode 100644
index 1386f9d..0000000
--- a/res/drawable-xhdpi/ic_favorite_off_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_favorite_on_lt.png b/res/drawable-xhdpi/ic_favorite_on_lt.png
deleted file mode 100644
index 903adc0..0000000
--- a/res/drawable-xhdpi/ic_favorite_on_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_groups_holo_dark.png b/res/drawable-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index d7348fb..0000000
--- a/res/drawable-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_field_holo_light.png b/res/drawable-xhdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index 1328290..0000000
--- a/res/drawable-xhdpi/ic_menu_add_field_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_compose_holo_dark.png b/res/drawable-xhdpi/ic_menu_compose_holo_dark.png
deleted file mode 100644
index cd868d2..0000000
--- a/res/drawable-xhdpi/ic_menu_compose_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index e18fca3..0000000
--- a/res/drawable-xhdpi/ic_menu_compose_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_pressed_holo_light.9.png b/res/drawable-xhdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index f4af926..0000000
--- a/res/drawable-xhdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png b/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 8fb0636..0000000
--- a/res/drawable-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/panel_favorites_holo_light.9.png b/res/drawable-xhdpi/panel_favorites_holo_light.9.png
deleted file mode 100644
index 13212c4..0000000
--- a/res/drawable-xhdpi/panel_favorites_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickcon_background_texture.png b/res/drawable-xhdpi/quickcon_background_texture.png
deleted file mode 100644
index 3980eca..0000000
--- a/res/drawable-xhdpi/quickcon_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/bg_people_updates_holo.9.png b/res/drawable-xxhdpi/bg_people_updates_holo.9.png
deleted file mode 100644
index fb2dbb9..0000000
--- a/res/drawable-xxhdpi/bg_people_updates_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png b/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png
deleted file mode 100644
index b7cf983..0000000
--- a/res/drawable-xxhdpi/btn_star_off_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png b/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png
deleted file mode 100644
index 0201cbd..0000000
--- a/res/drawable-xxhdpi/btn_star_on_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png b/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png
deleted file mode 100644
index 083e432..0000000
--- a/res/drawable-xxhdpi/ic_ab_favourites_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_group_dk.png b/res/drawable-xxhdpi/ic_add_group_dk.png
deleted file mode 100644
index df3bb19..0000000
--- a/res/drawable-xxhdpi/ic_add_group_dk.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_favorite_off_lt.png b/res/drawable-xxhdpi/ic_favorite_off_lt.png
deleted file mode 100644
index b7cf983..0000000
--- a/res/drawable-xxhdpi/ic_favorite_off_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_favorite_on_lt.png b/res/drawable-xxhdpi/ic_favorite_on_lt.png
deleted file mode 100644
index 0201cbd..0000000
--- a/res/drawable-xxhdpi/ic_favorite_on_lt.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_groups_holo_dark.png b/res/drawable-xxhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6fdaa5d..0000000
--- a/res/drawable-xxhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png b/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index f8ed465..0000000
--- a/res/drawable-xxhdpi/ic_menu_add_field_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png b/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png
deleted file mode 100644
index 0b2a07d..0000000
--- a/res/drawable-xxhdpi/ic_menu_compose_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_compose_holo_light.png b/res/drawable-xxhdpi/ic_menu_compose_holo_light.png
deleted file mode 100644
index bbca49f..0000000
--- a/res/drawable-xxhdpi/ic_menu_compose_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_message_24dp.png b/res/drawable-xxhdpi/ic_message_24dp.png
index 3b74d32..e7ca6bd 100644
--- a/res/drawable-xxhdpi/ic_message_24dp.png
+++ b/res/drawable-xxhdpi/ic_message_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_phone_24dp.png b/res/drawable-xxhdpi/ic_phone_24dp.png
index 3c546e5..ab538ff 100644
--- a/res/drawable-xxhdpi/ic_phone_24dp.png
+++ b/res/drawable-xxhdpi/ic_phone_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_place_24dp.png b/res/drawable-xxhdpi/ic_place_24dp.png
index 0eca249..8a37614 100644
--- a/res/drawable-xxhdpi/ic_place_24dp.png
+++ b/res/drawable-xxhdpi/ic_place_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_star_24dp.png b/res/drawable-xxhdpi/ic_star_24dp.png
index eeb659e..34e7c56 100644
--- a/res/drawable-xxhdpi/ic_star_24dp.png
+++ b/res/drawable-xxhdpi/ic_star_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_star_outline_24dp.png b/res/drawable-xxhdpi/ic_star_outline_24dp.png
index d1728ff..2afcf04 100644
--- a/res/drawable-xxhdpi/ic_star_outline_24dp.png
+++ b/res/drawable-xxhdpi/ic_star_outline_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/list_pressed_holo_light.9.png b/res/drawable-xxhdpi/list_pressed_holo_light.9.png
deleted file mode 100644
index 1352a17..0000000
--- a/res/drawable-xxhdpi/list_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/quickcon_background_texture.png b/res/drawable-xxhdpi/quickcon_background_texture.png
deleted file mode 100644
index aaf5741..0000000
--- a/res/drawable-xxhdpi/quickcon_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/expanding_entry_card_expand_white_24.png b/res/drawable-xxxhdpi/expanding_entry_card_expand_white_24.png
new file mode 100644
index 0000000..b972190
--- /dev/null
+++ b/res/drawable-xxxhdpi/expanding_entry_card_expand_white_24.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/fab_blue.png b/res/drawable-xxxhdpi/fab_blue.png
new file mode 100644
index 0000000..1dd8a92
--- /dev/null
+++ b/res/drawable-xxxhdpi/fab_blue.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_call_arrow.png b/res/drawable-xxxhdpi/ic_call_arrow.png
new file mode 100644
index 0000000..8243c25
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_call_arrow.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_email_24dp.png b/res/drawable-xxxhdpi/ic_email_24dp.png
new file mode 100644
index 0000000..29ed46a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_email_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_event_24dp.png b/res/drawable-xxxhdpi/ic_event_24dp.png
new file mode 100644
index 0000000..07f2d82
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_event_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_message_24dp.png b/res/drawable-xxxhdpi/ic_message_24dp.png
new file mode 100644
index 0000000..f917193
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_message_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_phone_24dp.png b/res/drawable-xxxhdpi/ic_phone_24dp.png
new file mode 100644
index 0000000..1f12d8d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_phone_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_place_24dp.png b/res/drawable-xxxhdpi/ic_place_24dp.png
new file mode 100644
index 0000000..e3efd0c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_place_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_star_24dp.png b/res/drawable-xxxhdpi/ic_star_24dp.png
index bd1cd8d..7e6c8a9 100644
--- a/res/drawable-xxxhdpi/ic_star_24dp.png
+++ b/res/drawable-xxxhdpi/ic_star_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_star_outline_24dp.png b/res/drawable-xxxhdpi/ic_star_outline_24dp.png
index cb90707..e3a4362 100644
--- a/res/drawable-xxxhdpi/ic_star_outline_24dp.png
+++ b/res/drawable-xxxhdpi/ic_star_outline_24dp.png
Binary files differ
diff --git a/res/layout-sw600dp/contact_list_content.xml b/res/layout-sw600dp/contact_list_content.xml
deleted file mode 100644
index 1b52068..0000000
--- a/res/layout-sw600dp/contact_list_content.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/pinned_header_list_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal">
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:background="@color/contact_all_list_background_color"
- android:layout_weight="@integer/people_activity_list_view_layout_weight"
- android:elevation="@dimen/people_activity_card_elevation"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- </LinearLayout>
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <!-- Shown only when an Account filter is set.
- - paddingTop should be here to show "shade" effect correctly. -->
- <include
- android:id="@+id/account_filter_header_container"
- layout="@layout/account_filter_header" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1" >
- <view
- class="com.android.contacts.common.list.PinnedHeaderListView"
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginLeft="?attr/contact_browser_list_padding_left"
- android:layout_marginRight="?attr/contact_browser_list_padding_right"
- android:layout_marginStart="?attr/contact_browser_list_padding_left"
- android:layout_marginEnd="?attr/contact_browser_list_padding_right"
- android:fastScrollEnabled="true"
- android:fadingEdge="none" />
- <ProgressBar
- android:id="@+id/search_progress"
- style="?android:attr/progressBarStyleLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:visibility="gone" />
- </FrameLayout>
- </LinearLayout>
-</FrameLayout>
diff --git a/res/layout-sw600dp/contact_tile_list.xml b/res/layout-sw600dp/contact_tile_list.xml
deleted file mode 100644
index 102a58d..0000000
--- a/res/layout-sw600dp/contact_tile_list.xml
+++ /dev/null
@@ -1,64 +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.
--->
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="?attr/favorites_padding_bottom">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal">
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:background="@color/contact_favorites_list_background_color"
- android:layout_weight="@integer/people_activity_list_view_layout_weight"
- android:elevation="@dimen/people_activity_card_elevation"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- </LinearLayout>
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ListView
- android:id="@+id/contact_tile_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="@dimen/contact_tile_list_padding_top"
- android:clipToPadding="false"
- android:fadingEdge="none"
- android:divider="@null"
- android:scrollbarStyle="outsideOverlay"/>
- <TextView
- android:id="@+id/contact_tile_list_empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_horizontal"
- android:layout_marginTop="@dimen/empty_message_top_margin"
- android:textColor="?android:attr/textColorSecondary"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
- </FrameLayout>
-</FrameLayout>
diff --git a/res/layout-sw600dp/contacts_unavailable_fragment.xml b/res/layout-sw600dp/contacts_unavailable_fragment.xml
deleted file mode 100644
index 8727359..0000000
--- a/res/layout-sw600dp/contacts_unavailable_fragment.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="?attr/favorites_padding_bottom">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal">
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:background="@color/contact_favorites_list_background_color"
- android:layout_weight="@integer/people_activity_list_view_layout_weight"
- android:elevation="@dimen/people_activity_card_elevation"/>
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/people_activity_space_layout_weight"
- android:background="@color/background_primary"/>
- </LinearLayout>
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
- <include layout="@layout/contacts_unavailable_fragment_content"/>
- </ScrollView>
-</FrameLayout>
diff --git a/res/layout/contact_picker_content.xml b/res/layout/contact_picker_content.xml
index 0d92b3f..c71314e 100644
--- a/res/layout/contact_picker_content.xml
+++ b/res/layout/contact_picker_content.xml
@@ -18,6 +18,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <include layout="@layout/contact_list_card"/>
+
<view
class="com.android.contacts.common.list.PinnedHeaderListView"
android:id="@android:id/list"
diff --git a/res/layout/contact_tile_list.xml b/res/layout/contact_tile_list.xml
index 1b5ec9d..e941617 100644
--- a/res/layout/contact_tile_list.xml
+++ b/res/layout/contact_tile_list.xml
@@ -21,6 +21,8 @@
android:paddingBottom="?attr/favorites_padding_bottom"
android:background="@color/background_primary">
+ <include layout="@layout/contact_list_card"/>
+
<ListView
android:id="@+id/contact_tile_list"
android:layout_width="match_parent"
@@ -28,7 +30,8 @@
android:paddingTop="@dimen/contact_tile_list_padding_top"
android:clipToPadding="false"
android:fadingEdge="none"
- android:divider="@null" />
+ android:divider="@null"
+ android:scrollbarStyle="outsideOverlay"/>
<TextView
android:id="@+id/contact_tile_list_empty"
diff --git a/res/layout/contacts_unavailable_fragment.xml b/res/layout/contacts_unavailable_fragment.xml
index 239693c..300921f 100644
--- a/res/layout/contacts_unavailable_fragment.xml
+++ b/res/layout/contacts_unavailable_fragment.xml
@@ -13,11 +13,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
-<ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:fillViewport="true"
- android:background="@color/background_primary">
- <include layout="@layout/contacts_unavailable_fragment_content"/>
-</ScrollView>
+ <include layout="@layout/contact_list_card"/>
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:background="@color/background_primary">
+ <include layout="@layout/contacts_unavailable_fragment_content"/>
+ </ScrollView>
+</FrameLayout>
diff --git a/res/layout/join_contact_picker_list_content.xml b/res/layout/join_contact_picker_list_content.xml
index a051c60..5bde895 100644
--- a/res/layout/join_contact_picker_list_content.xml
+++ b/res/layout/join_contact_picker_list_content.xml
@@ -40,6 +40,7 @@
android:id="@+id/pinned_header_list_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <include layout="@layout/contact_list_card"/>
<view
class="com.android.contacts.common.list.PinnedHeaderListView"
android:id="@android:id/list"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b67311c..f6c44ef 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"الحدث"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"العلاقة"</string>
<string name="content_description_directions" msgid="2686791825798189335">"الاتجاهات إلى الموقع"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"أنت: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7e35570..0fdb762 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Събитие"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Отношение"</string>
<string name="content_description_directions" msgid="2686791825798189335">"упътвания до местоположението"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3d18b5a..e5aad07 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Esdeveniment"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relació"</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicacions cap a la ubicació"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Usuari: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 21202d3..24ce33c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Událost"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Vztah"</string>
<string name="content_description_directions" msgid="2686791825798189335">"trasy k místům"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c81bd1f..c77e309 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Event"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relation"</string>
<string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c81bd1f..c77e309 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Event"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relation"</string>
<string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-en-rUS/strings.xml b/res/values-en-rUS/strings.xml
deleted file mode 100644
index e1d4184..0000000
--- a/res/values-en-rUS/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <!-- Field title for the given name of a contact -->
- <string name="name_given">First name</string>
- <!-- Field title for the family name of a contact -->
- <string name="name_family">Last name</string>
-
- <!-- An allowable value for the "sort list by" contact display option -->
- <string name="display_options_sort_by_given_name">First name</string>
-
- <!-- An allowable value for the "sort list by" contact display option -->
- <string name="display_options_sort_by_family_name">Last name</string>
-
- <!-- An allowable value for the "view names as" contact display option -->
- <string name="display_options_view_given_name_first">First name first</string>
-
- <!-- An allowable value for the "view names as" contact display option -->
- <string name="display_options_view_family_name_first">Last name first</string>
-</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 99c072d..7a1a6ad 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Sündmus"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Seos"</string>
<string name="content_description_directions" msgid="2686791825798189335">"juhised asukohta"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Teie: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index e938938..0be4eee 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Gertaera"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Erlazioa"</string>
<string name="content_description_directions" msgid="2686791825798189335">"kokapenerako jarraibideak"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Zu: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9ebe4b2..b8bb3c5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Tapahtuma"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Suhde"</string>
<string name="content_description_directions" msgid="2686791825798189335">"reittiohjeet sijaintiin"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Sinä: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ce69856..03a56b6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Événement"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relation"</string>
<string name="content_description_directions" msgid="2686791825798189335">"itinéraire vers le lieu"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1aad05a..ea25ac6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"ईवेंट"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"संबंध"</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थान के लिए दिशा निर्देश"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"आप: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bd57e31..802a354 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Događaj"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Odnos"</string>
<string name="content_description_directions" msgid="2686791825798189335">"upute do lokacije"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 078d0a2..6c4653a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Esemény"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Viszony"</string>
<string name="content_description_directions" msgid="2686791825798189335">"útvonalterv a helyhez"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Ön: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 691a756..63c8bc4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Acara"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Hubungan"</string>
<string name="content_description_directions" msgid="2686791825798189335">"petunjuk arah ke lokasi"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c718701..b0bf10b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"אירוע"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"קשר"</string>
<string name="content_description_directions" msgid="2686791825798189335">"הנחיות הגעה למיקום"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"אתה: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 27a6902..d125ade 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"予定"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"関係"</string>
<string name="content_description_directions" msgid="2686791825798189335">"場所までの経路"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"あなた: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index b3aa227..313a9f9 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"მოვლენა"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"კავშირი"</string>
<string name="content_description_directions" msgid="2686791825798189335">"მიმართულებები მდებარეობამდე"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"თქვენ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 55346f0..0309ea2 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Оқиға"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Қатынас"</string>
<string name="content_description_directions" msgid="2686791825798189335">"орынға бағыттар"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Сіз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d68f348..a5e31cb 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"ព្រឹត្តិការណ៍"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"ទំនាក់ទំនង"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ទិសដៅទៅទីតាំង"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"អ្នក៖ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dcbf49d..b00bc00 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"일정"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"관계"</string>
<string name="content_description_directions" msgid="2686791825798189335">"길찾기"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"내가 보낸 메시지: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index b2d4d09..d421e3f 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -328,6 +328,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Иш-чара"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Мамилелик катышы"</string>
<string name="content_description_directions" msgid="2686791825798189335">"жайгашуу ордуна багыттоолор"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Сиз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ca3674c..1142889 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"ການນັດໝາຍ"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"ຄວາມສຳພັນ"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ເສັ້ນທາງໄປຫາສະຖານທີ່"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"ທ່ານ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8e8c134..cb76360 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Įvykis"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Ryšys"</string>
<string name="content_description_directions" msgid="2686791825798189335">"nuorodos į vietovę"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c1b165b..9ee65dc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Pasākums"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Saistība"</string>
<string name="content_description_directions" msgid="2686791825798189335">"norādes uz atrašanās vietu"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 6eb2884..bff186a 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Настан"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Врска"</string>
<string name="content_description_directions" msgid="2686791825798189335">"насоки до локација"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2d74aa0..b74aa6d 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Acara"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Hubungan"</string>
<string name="content_description_directions" msgid="2686791825798189335">"arah ke lokasi"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 33b0419..160ca2c 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"घटना"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"सम्बन्ध"</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थानको लागि निर्देशनहरू"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"तपाईँ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f319c20..40406eb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Evento"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relação"</string>
<string name="content_description_directions" msgid="2686791825798189335">"rotas até o local"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1fdbd92..1e5d386 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Мероприятие"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Отношение"</string>
<string name="content_description_directions" msgid="2686791825798189335">"Маршруты"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Вы: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index c253d58..1c73df2 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"සිදුවීම"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"සම්බන්ධතාව"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ස්ථානයට දිශාවන්"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"ඔබ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index aa17683..343f545 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Udalosť"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Vzťah"</string>
<string name="content_description_directions" msgid="2686791825798189335">"trasa do miesta"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b7f771c..4cddbc2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Dogodek"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Razmerje"</string>
<string name="content_description_directions" msgid="2686791825798189335">"navodila do mesta"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 96785d6..e1136e3 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Догађај"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Однос"</string>
<string name="content_description_directions" msgid="2686791825798189335">"упутства до локације"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sw600dp-land/bools.xml b/res/values-sw600dp-land/bools.xml
deleted file mode 100644
index 2ef703c..0000000
--- a/res/values-sw600dp-land/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<resources>
-
- <bool name="contact_all_list_show_card_frame">true</bool>
-
-</resources>
diff --git a/res/values-sw600dp-land/integers.xml b/res/values-sw600dp-land/integers.xml
index 4bf44c0..08aab2d 100644
--- a/res/values-sw600dp-land/integers.xml
+++ b/res/values-sw600dp-land/integers.xml
@@ -15,14 +15,14 @@
-->
<resources>
<!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
- <integer name="contact_tile_column_count_in_favorites">4</integer>
+ <integer name="contact_tile_column_count_in_favorites">5</integer>
<integer name="contact_tile_column_count">3</integer>
<!-- Layout weight of space elements in PeopleActivity for favorites list and all
- contacts list-->
- <integer name="people_activity_space_layout_weight">1</integer>
+ contacts list-->
+ <integer name="contact_list_space_layout_weight">1</integer>
<!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
contacts list in PeopleActivity -->
- <integer name="people_activity_list_view_layout_weight">3</integer>
+ <integer name="contact_list_card_layout_weight">6</integer>
</resources>
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
deleted file mode 100644
index 2ef703c..0000000
--- a/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<resources>
-
- <bool name="contact_all_list_show_card_frame">true</bool>
-
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index e99dccf..a001a63 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -25,12 +25,20 @@
<dimen name="list_section_height">37dip</dimen>
<dimen name="group_detail_border_padding">16dip</dimen>
<dimen name="search_view_width">400dip</dimen>
- <dimen name="contact_tile_list_padding_top">16dip</dimen>
+ <dimen name="contact_tile_list_padding_top">18dip</dimen>
+ <dimen name="contact_browser_list_item_text_size">18sp</dimen>
+ <dimen name="contact_browser_list_item_photo_size">50dp</dimen>
+ <dimen name="contact_browser_list_item_gap_between_image_and_text">15dp</dimen>
+ <dimen name="contact_browser_list_top_margin">18dp</dimen>
<!-- Contact list (vertical scroll bar comes left) -->
<dimen name="list_visible_scrollbar_padding">32dip</dimen>
<dimen name="list_header_extra_top_padding">@dimen/contact_browser_list_top_margin</dimen>
<dimen name="quick_contact_photo_container_height">360dip</dimen>
+ <!-- Height of the selection indicator of a tab. -->
+ <dimen name="tab_selected_underline_height">3dp</dimen>
+ <!-- Size of text in tabs. -->
+ <dimen name="tab_text_size">16sp</dimen>
<!-- Because the "join" screen has the vertical scroll bar on right,
we cannot use @dimen/contact_browser_list_header_left_margin as is. -->
@@ -50,4 +58,5 @@
<!-- Left padding of the auto complete field to line hint text up with member list -->
<dimen name="group_editor_autocomplete_left_padding">16dip</dimen>
<dimen name="contact_detail_list_top_padding">8dip</dimen>
+ <dimen name="frequently_contacted_title_text_size">24sp</dimen>
</resources>
diff --git a/res/values-sw600dp/integers.xml b/res/values-sw600dp/integers.xml
index ab2a52d..19e2ec6 100644
--- a/res/values-sw600dp/integers.xml
+++ b/res/values-sw600dp/integers.xml
@@ -15,10 +15,6 @@
-->
<resources>
<integer name="contact_tile_column_count">2</integer>
- <!-- Layout weight of space elements in PeopleActivity for favorites list and all
- contacts list-->
- <integer name="people_activity_space_layout_weight">1</integer>
- <!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
- contacts list in PeopleActivity -->
- <integer name="people_activity_list_view_layout_weight">5</integer>
+ <!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
+ <integer name="contact_tile_column_count_in_favorites">4</integer>
</resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 6a2d1cc..9dfb96a 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -20,4 +20,7 @@
<dimen name="contact_tile_list_padding_top">32dip</dimen>
<dimen name="list_visible_scrollbar_padding">48dip</dimen>
<dimen name="detail_contact_photo_size">256dip</dimen>
+ <!-- Right margin of the floating action button -->
+ <dimen name="floating_action_button_margin_right">32dp</dimen>
+ <dimen name="people_activity_landscape_tabs_text_size">16dp</dimen>
</resources>
diff --git a/res/values-sw720dp-land/integers.xml b/res/values-sw720dp-land/integers.xml
index d247e46..2ebb100 100644
--- a/res/values-sw720dp-land/integers.xml
+++ b/res/values-sw720dp-land/integers.xml
@@ -15,4 +15,6 @@
-->
<resources>
<integer name="contact_tile_column_count">4</integer>
+ <!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
+ <integer name="contact_tile_column_count_in_favorites">5</integer>
</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 827c71b..1ce9a6f 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -26,4 +26,6 @@
<dimen name="quickcontact_title_initial_margin">32dp</dimen>
<!-- Initial size of QuickContact's title size -->
<dimen name="quickcontact_maximum_title_size">64dp</dimen>
+ <!-- Right margin of the floating action button -->
+ <dimen name="floating_action_button_margin_right">100dp</dimen>
</resources>
diff --git a/res/values-sw720dp/integers.xml b/res/values-sw720dp/integers.xml
index 7c94a14..de13e46 100644
--- a/res/values-sw720dp/integers.xml
+++ b/res/values-sw720dp/integers.xml
@@ -15,7 +15,14 @@
-->
<resources>
<!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
- <integer name="contact_tile_column_count_in_favorites">3</integer>
+ <integer name="contact_tile_column_count_in_favorites">4</integer>
<integer name="contact_tile_column_count">2</integer>
+
+ <!-- Layout weight of space elements in PeopleActivity for favorites list and all
+ contacts list-->
+ <integer name="contact_list_space_layout_weight">11</integer>
+ <!-- Layout weight of ListViews in PeopleActivityfor tile favorites list and all
+ contacts list in PeopleActivity -->
+ <integer name="contact_list_card_layout_weight">81</integer>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0871379..2ae27fa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"กิจกรรม"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"ความสัมพันธ์"</string>
<string name="content_description_directions" msgid="2686791825798189335">"เส้นทางไปยังสถานที่"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"คุณ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 12629c8..faaf052 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Kaganapan"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Kaugnayan"</string>
<string name="content_description_directions" msgid="2686791825798189335">"mga direksyon sa lokasyon"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 362120f..2a7ec39 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Etkinlik"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"İlişki"</string>
<string name="content_description_directions" msgid="2686791825798189335">"konum için yol tarifleri"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bbe6a7d..10536e1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Подія"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Зв’язок"</string>
<string name="content_description_directions" msgid="2686791825798189335">"маршрути до місця"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 9cddb5b..e0216d7 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"ایونٹ"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"رشتہ"</string>
<string name="content_description_directions" msgid="2686791825798189335">"مقام کیلئے ڈائریکشنز"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"آپ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 3296520..a9d7eb3 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Tadbir"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Aloqadorlik"</string>
<string name="content_description_directions" msgid="2686791825798189335">"manzilga yo\'nalishlar"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5874c3e..a953db5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"Sự kiện"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Quan hệ"</string>
<string name="content_description_directions" msgid="2686791825798189335">"chỉ đường tới địa điểm"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"Bạn: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1a39917..b856520 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"活动"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"关系"</string>
<string name="content_description_directions" msgid="2686791825798189335">"到特定地点的路线"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c72fbb5..92eb944 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"活動"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"關係"</string>
<string name="content_description_directions" msgid="2686791825798189335">"規劃前往特定地點的路線"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f73ee60..9b6ceb8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -248,6 +248,5 @@
<string name="header_event_entry" msgid="6738250422744401460">"活動"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"關係"</string>
<string name="content_description_directions" msgid="2686791825798189335">"規劃前往特定地點的路線"</string>
- <!-- no translation found for message_from_you_prefix (7180706529908434482) -->
- <skip />
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2a53896..6cd9c14 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,9 +19,6 @@
<color name="quickcontact_entry_sub_header_text_color">#737373</color>
<color name="quickcontact_entry_header_text_color">#202020</color>
- <!-- Color of the background of the contact detail and editor pages -->
- <color name="background_primary">#f5f5f5</color>
-
<color name="background_social_updates">#ffeeeeee</color>
<!-- TODO: remove these colors once we delete the group code (b/16522929) -->
@@ -55,9 +52,6 @@
<color name="call_arrow_green">#2aad6f</color>
<color name="call_arrow_red">#ff2e58</color>
- <color name="contact_all_list_background_color">#FFFFFF</color>
- <color name="contact_favorites_list_background_color">#FFFFFF</color>
-
<!-- Background color of pinned header items. -->
<color name="list_item_pinned_header_color">#f5f5f5</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d422627..c44d899 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -183,7 +183,6 @@
<dimen name="expanding_entry_card_item_header_only_margin_bottom">2dp</dimen>
<dimen name="expanding_entry_card_item_no_icon_margin_top">6dp</dimen>
- <dimen name="people_activity_card_elevation">2dp</dimen>
<!-- The width the that the tabs occupy in the ActionBar when in landscape mode.
426dp is the height of a "small" screen. We should leave 240dp for
the title and menu items -->
diff --git a/src/com/android/contacts/list/ContactTileListFragment.java b/src/com/android/contacts/list/ContactTileListFragment.java
index bce7bfe..189cfd3 100644
--- a/src/com/android/contacts/list/ContactTileListFragment.java
+++ b/src/com/android/contacts/list/ContactTileListFragment.java
@@ -30,17 +30,16 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
import android.widget.ListView;
import android.widget.TextView;
-
import com.android.contacts.R;
-import com.android.contacts.util.SchedulingUtils;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactTileLoaderFactory;
import com.android.contacts.common.list.ContactTileAdapter;
-import com.android.contacts.common.list.ContactTileView;
import com.android.contacts.common.list.ContactTileAdapter.DisplayType;
+import com.android.contacts.common.list.ContactTileView;
+import com.android.contacts.common.util.ContactListViewUtils;
+import com.android.contacts.common.util.SchedulingUtils;
/**
* Fragment containing a list of starred contacts followed by a list of frequently contacted.
@@ -64,7 +63,6 @@
private TextView mEmptyView;
private ListView mListView;
- private boolean mContactAllListShowCardFrame;
private boolean mOptionsMenuHasFrequents;
@Override
@@ -73,7 +71,6 @@
Resources res = getResources();
int columnCount = res.getInteger(R.integer.contact_tile_column_count_in_favorites);
- mContactAllListShowCardFrame = res.getBoolean(R.bool.contact_all_list_show_card_frame);
mAdapter = new ContactTileAdapter(activity, mAdapterListener,
columnCount, mDisplayType);
@@ -96,30 +93,22 @@
mListView.setItemsCanFocus(true);
mListView.setAdapter(mAdapter);
+ ContactListViewUtils.applyCardPaddingToView(getResources(), mListView, listLayout);
- // If the device is in the sw600dp class, set a padding on the list
- // view so it appears in the center of the card in the layout.
- if (mContactAllListShowCardFrame) {
- SchedulingUtils.doOnPreDraw(mListView, true, new Runnable() {
- @Override
- public void run() {
- Resources res = getResources();
- int listSpaceWeight = res.getInteger(R.integer
- .people_activity_space_layout_weight);
- int listViewWeight = res.getInteger(R.integer
- .people_activity_list_view_layout_weight);
- double paddingPercent = (double) listSpaceWeight / (double)
- (listSpaceWeight * 2 + listViewWeight);
- int width = mListView.getWidth();
- mListView.setPadding((int) (width * paddingPercent), mListView.getPaddingTop(),
- (int)(width * paddingPercent), mListView.getPaddingBottom());
- }
- });
- }
return listLayout;
}
@Override
+ public void onHiddenChanged(boolean hidden) {
+ super.onHiddenChanged(hidden);
+ if (getActivity() != null && getView() != null && !hidden) {
+ // If the padding was last applied when in a hidden state, it may have been applied
+ // incorrectly. Therefore we need to reapply it.
+ ContactListViewUtils.applyCardPaddingToView(getResources(), mListView, getView());
+ }
+ }
+
+ @Override
public void onStart() {
super.onStart();
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 335a564..bf1bdca 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -18,17 +18,13 @@
import android.content.Context;
import android.content.CursorLoader;
import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Color;
import android.provider.ContactsContract.Contacts;
import android.text.TextUtils;
import android.util.Log;
-import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityEvent;
import android.widget.Button;
import android.widget.FrameLayout;
@@ -36,14 +32,12 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.util.SchedulingUtils;
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.common.util.ViewUtil;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.common.util.AccountFilterUtil;
@@ -64,7 +58,6 @@
private TextView mProfileTitle;
private View mSearchProgress;
private TextView mSearchProgressText;
- private boolean mContactAllListShowCardFrame;
private class FilterHeaderClickListener implements OnClickListener {
@Override
@@ -100,8 +93,6 @@
protected ContactListAdapter createListAdapter() {
DefaultContactListAdapter adapter = new DefaultContactListAdapter(getContext());
adapter.setSectionHeaderDisplayEnabled(isSectionHeaderDisplayEnabled());
- mContactAllListShowCardFrame = getResources().getBoolean(
- R.bool.contact_all_list_show_card_frame);
adapter.setDisplayPhotos(true);
adapter.setPhotoPosition(
ContactListItemView.getDefaultPhotoPosition(/* opposite = */ false));
@@ -133,25 +124,6 @@
getListView().addHeaderView(headerContainer, null, false);
checkHeaderViewVisibility();
- // If the device is in the sw600dp class and in landscape mode, set a padding on the list
- // view so it appears in the center of the card in the layout.
- if (mContactAllListShowCardFrame) {
- SchedulingUtils.doOnPreDraw(getListView(), true, new Runnable() {
- @Override
- public void run() {
- final ListView listView = getListView();
- final int width = listView.getWidth();
- listView.setPadding(width / 4, listView.getPaddingTop(),
- width / 4, listView.getPaddingBottom());
- mAccountFilterHeader.setPadding(
- mAccountFilterHeader.getPaddingLeft() + width / 4,
- mAccountFilterHeader.getPaddingTop(),
- mAccountFilterHeader.getPaddingRight() + width / 4,
- mAccountFilterHeader.getPaddingBottom());
- }
- });
- }
-
mSearchProgress = getView().findViewById(R.id.search_progress);
mSearchProgressText = (TextView) mSearchHeaderView.findViewById(R.id.totalContactsText);
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index f486b1f..cedbea8 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -31,6 +31,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
@@ -1478,12 +1479,23 @@
@Override
protected MaterialPalette doInBackground(Void... params) {
- if (imageViewDrawable instanceof BitmapDrawable) {
- final Bitmap bitmap = ((BitmapDrawable) imageViewDrawable).getBitmap();
- final int primaryColor = colorFromBitmap(bitmap);
- if (primaryColor != 0) {
- return mMaterialColorMapUtils.calculatePrimaryAndSecondaryColor(
- primaryColor);
+ if (imageViewDrawable instanceof BitmapDrawable
+ && mContactData.getThumbnailPhotoBinaryData() != null
+ && mContactData.getThumbnailPhotoBinaryData().length > 0) {
+ // Perform the color analysis on the thumbnail instead of the full sized
+ // image, so that our results will be as similar as possible to the Bugle
+ // app.
+ final Bitmap bitmap = BitmapFactory.decodeByteArray(
+ mContactData.getThumbnailPhotoBinaryData(), 0,
+ mContactData.getThumbnailPhotoBinaryData().length);
+ try {
+ final int primaryColor = colorFromBitmap(bitmap);
+ if (primaryColor != 0) {
+ return mMaterialColorMapUtils.calculatePrimaryAndSecondaryColor(
+ primaryColor);
+ }
+ } finally {
+ bitmap.recycle();
}
}
if (imageViewDrawable instanceof LetterTileDrawable) {
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 5603437..a46749f 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -277,8 +277,8 @@
mActionBarGradientView = findViewById(R.id.action_bar_gradient);
mActionBarGradientView.setBackground(mActionBarGradientDrawable);
+ mPhotoTouchInterceptOverlay = findViewById(R.id.photo_touch_intercept_overlay);
if (!mIsTwoPanel) {
- mPhotoTouchInterceptOverlay = findViewById(R.id.photo_touch_intercept_overlay);
mPhotoTouchInterceptOverlay.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
