Merge "Do DataUsageFeedback update after starting ACTION_CALL"
diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f769..0000000
--- a/res/drawable-hdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f35..0000000
--- a/res/drawable-mdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b0..0000000
--- a/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb..0000000
--- a/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d322aa..0000000
--- a/res/drawable-xxxhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-land/compact_contact_editor_fragment.xml b/res/layout-land/compact_contact_editor_fragment.xml
index ffc8f4f..2363091 100644
--- a/res/layout-land/compact_contact_editor_fragment.xml
+++ b/res/layout-land/compact_contact_editor_fragment.xml
@@ -24,21 +24,7 @@
android:orientation="horizontal"
android:visibility="invisible">
- <com.android.contacts.editor.CompactPhotoEditorView
- android:id="@+id/photo_editor"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:orientation="vertical">
-
- <com.android.contacts.widget.QuickContactImageView
- android:id="@+id/photo"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="true"
- android:scaleType="centerCrop"/>
-
- </com.android.contacts.editor.CompactPhotoEditorView>
+ <include layout="@layout/compact_photo_editor_view" />
<ScrollView
android:layout_width="match_parent"
diff --git a/res/layout/compact_contact_editor_fields.xml b/res/layout/compact_contact_editor_fields.xml
index 723c952..f59c5be 100644
--- a/res/layout/compact_contact_editor_fields.xml
+++ b/res/layout/compact_contact_editor_fields.xml
@@ -60,28 +60,20 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/divider_line_height"
- android:background="@color/divider_line_color_light"/>
-
+ <!-- See the comment for EditKindIconStyle in styles.xml, we use (16 + 24 + 32) dp of
+ padding (start margin + icon width + end margin) for this to line up with the start
+ of the edit fields. -->
<TextView
+ android:background="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingEnd="@dimen/expanding_entry_card_item_image_spacing"
+ android:minHeight="@dimen/editor_min_line_item_height"
+ android:paddingStart="72dp"
android:gravity="center_vertical"
- android:paddingBottom="@dimen/expanding_entry_card_button_padding_vertical"
- android:paddingTop="@dimen/expanding_entry_card_button_padding_vertical"
android:text="@string/compact_editor_more_fields"
- android:textAlignment="viewEnd"
- android:textColor="@color/expanding_entry_card_button_text_color"
+ android:textColor="?android:attr/colorAccent"
android:textSize="@dimen/expanding_entry_card_title_text_size"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/divider_line_height"
- android:background="@color/divider_line_color_light"/>
-
</LinearLayout>
</merge>
\ No newline at end of file
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index d38184b..a6cda4c 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -29,21 +29,7 @@
android:orientation="vertical"
android:visibility="invisible">
- <com.android.contacts.editor.CompactPhotoEditorView
- android:id="@+id/photo_editor"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:orientation="vertical">
-
- <com.android.contacts.widget.QuickContactImageView
- android:id="@+id/photo"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="true"
- android:scaleType="centerCrop"/>
-
- </com.android.contacts.editor.CompactPhotoEditorView>
+ <include layout="@layout/compact_photo_editor_view" />
<include layout="@layout/compact_contact_editor_fields" />
diff --git a/res/layout/compact_photo_editor_view.xml b/res/layout/compact_photo_editor_view.xml
new file mode 100644
index 0000000..33449a8
--- /dev/null
+++ b/res/layout/compact_photo_editor_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+
+<com.android.contacts.editor.CompactPhotoEditorView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/photo_editor"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal">
+
+ <com.android.contacts.widget.QuickContactImageView
+ android:id="@+id/photo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"/>
+
+ <View
+ android:id="@+id/photo_icon_overlay"
+ android:layout_height="56dp"
+ android:layout_width="match_parent"
+ android:layout_alignParentBottom="true" />
+
+ <ImageView
+ android:id="@+id/photo_icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginBottom="16dp"
+ android:layout_marginEnd="16dp"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_photo_camera_white_24dp" />
+
+ <View
+ android:id="@+id/photo_touch_intercept_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/item_background_material_dark" />
+
+</com.android.contacts.editor.CompactPhotoEditorView>
\ No newline at end of file
diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml
index be15720..fe6d2b9 100644
--- a/res/menu/edit_contact.xml
+++ b/res/menu/edit_contact.xml
@@ -37,15 +37,6 @@
android:id="@+id/menu_delete"
android:title="@string/menu_deleteContact" />
- <!-- The compact contact editor will set this to visible but we don't want it
- in the fully expanded contact editor. -->
- <item
- android:id="@+id/menu_change_photo"
- android:title="@string/menu_change_photo"
- android:icon="@drawable/ic_photo_camera_white_24dp"
- android:showAsAction="always"
- android:visible="false" />
-
<item
android:id="@+id/menu_set_ringtone"
android:title="@string/menu_set_ring_tone" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 67f45be..ebe1302 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Wys alle kontakte"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Voorgestelde kontakte"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle kontakte"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakte saamgevoeg"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakte uitgevee"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Stel luitoon op"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle oproepe na stempos"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Jy kan nie kontakte uit leesalleen-rekeninge uitvee nie, maar jy kan hulle wel in jou kontaklyste versteek."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f9a7317..3bd810d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"ሁሉንም ዕውቂያዎች አሳይ"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"አስተያየት የተሰጠባቸው እውቅያዎች"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"ሁሉም እውቅያዎች"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"ዕውቂያዎች ተዋህደዋል"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ዕውቂያዎች ተሰርዘዋል"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"የጥሪ ድምፅ አዘጋጅ"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ሁሉንም ጥሪዎች ወደ ድምፅ መልዕክት"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"ዕውቂያዎችን ከንባብ-ብቻ መለያዎች መሰረዝ አይችሉም፤ ነገር ግን በዕውቂያ ዝርዝሮች ውስጥ መደበቅ ይችላሉ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e1c48bb..ac34a83 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"عرض جميع جهات الاتصال"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"جهات الاتصال المقترحة"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"جميع جهات الاتصال"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"تم دمج جهات الاتصال."</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"تم حذف جهات الاتصال."</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"تعيين نغمة رنين"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"جميع المكالمات إلى البريد الصوتي"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"لا يمكنك حذف جهات الاتصال من حسابات للقراءة فقط، ولكن يمكنك إخفاؤها في قوائم جهات الاتصال."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 192b304..62294fd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Показване на всички контакти"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Предлагани контакти"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Всички контакти"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контактите са обединени"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контактите са изтрити"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Мелодия: Задав."</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Всички обаждания до гл. поща"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Не можете да изтриете контакти от профили само за четене, но можете да ги скриете в списъците си с контакти."</string>
@@ -214,7 +212,7 @@
<string name="toast_text_copied" msgid="5143776250008541719">"Текстът бе копиран"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Да се отхвърлят ли направените от вас промени?"</string>
<string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
- <string name="profile_display_name" msgid="4127389543625918771">"Настройка на потребителския ми профил"</string>
+ <string name="profile_display_name" msgid="4127389543625918771">"Потребит. профил"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Въведете името на човека"</string>
<string name="group_name_hint" msgid="238359485263401293">"Име на групата"</string>
<string name="local_profile_title" msgid="2021416826991393684">"Моят локален потр. профил"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c82595b..c7ce0cf 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"সকল পরিচিতি দেখান"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"প্রস্তাবিত পরিচিতিগুলি"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"সকল পরিচিতি"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"পরিচিতিগুলি মার্জ করা হয়েছে"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"পরিচিতিগুলি মোছা হয়েছে"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"রিংটোন সেট করুন"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ভয়েসমেলে সকল কল"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"আপনি শুধুমাত্র-পাঠযোগ্য অ্যাকাউন্টগুলির পরিচিতিগুলিকে মুছতে পারবেন না, কিন্তু আপনি আপনার পরিচিতি তালিকায় তাদের লুকিয়ে রাখতে পারেন৷"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2dcb884..11947d6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostra tots els contactes"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactes suggerits"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tots els contactes"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contactes combinats"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"S\'han suprimit els contactes"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Estableix so"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Trucades a la bústia de veu"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"No pots suprimir cap contacte dels comptes de només lectura, però pots amagar-los a les llistes de contactes."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ab873dd..177f484 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Zobrazit všechny kontakty"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Navrhované kontakty"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Všechny kontakty"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakty byly sloučeny"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakty byly odstraněny"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Nastavit vyzvánění"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Hovory do hlas. schránky"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Z účtů pouze pro čtení není možné kontakty mazat, můžete je však ve svých seznamech kontaktů skrýt."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 77310a1..927a661 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Vis alle kontakter"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Foreslåede kontakter"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle kontakter"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktpersonerne blev slået sammen"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktpersonerne blev slettet"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Angiv ringetone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle opkald til telefonsvareren"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Du kan ikke slette kontaktpersoner fra skrivebeskyttede konti, men du kan skjule dem på listerne over dine kontaktpersoner."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7a3a612..0a6ad45 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Alle Kontakte anzeigen"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Vorgeschlagene Kontakte"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle Kontakte"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakte zusammengeführt"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakte gelöscht"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Klingeltonwahl"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle Anrufe an Mailbox"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Sie können keine Kontakte aus schreibgeschützten Konten löschen. Sie können sie aber in Ihren Kontaktlisten ausblenden."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 102bacc..30e47c6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Εμφάνιση όλων των επαφών"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Προτεινόμενες επαφές"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Όλες οι επαφές"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Οι επαφές συγχωνεύτηκαν"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Οι επαφές διαγράφηκαν"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Ήχος κλήσης"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Κλήσεις στον τηλεφωνητή"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Δεν μπορείτε να διαγράψετε επαφές από λογαριασμούς οι οποίοι προορίζονται μόνο για ανάγνωση, αλλά μπορείτε να τις αποκρύψετε στις λίστες επαφών σας."</string>
@@ -134,7 +132,7 @@
<string name="missing_app" msgid="1466111003546611387">"Δεν βρέθηκε εφαρμογή για τη διαχείριση αυτής της ενέργειας."</string>
<string name="menu_share" msgid="943789700636542260">"Κοινή χρήση"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"Προσθήκη στις επαφές"</string>
- <string name="share_via" msgid="563121028023030093">"Κοινή χρήση μέσω"</string>
+ <string name="share_via" msgid="563121028023030093">"Κοινή επαφή μέσω"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Δημιουργία ομάδας στο λογαριασμό"</string>
<string name="audio_chat" msgid="2535716629358298691">"Φωνητική συνομιλία"</string>
<string name="video_chat" msgid="1872255818640336072">"Συζήτηση μέσω βίντεο"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..b9176db
--- /dev/null
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2006 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:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="applicationLabel" msgid="3906689777043645443">"Contacts"</string>
+ <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacts"</string>
+ <string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
+ <string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
+ <string name="shortcutDialContact" msgid="746622101599186779">"Direct dial"</string>
+ <string name="shortcutMessageContact" msgid="2460337253595976198">"Direct message"</string>
+ <string name="shortcutActivityTitle" msgid="6642877210643565436">"Choose a contact short cut"</string>
+ <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choose a number to call"</string>
+ <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choose a number to message"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Add to contact"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Choose a contact"</string>
+ <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Create new contact"</string>
+ <string name="starredList" msgid="4817256136413959463">"Starred"</string>
+ <string name="frequentList" msgid="7154768136473953056">"Frequent"</string>
+ <string name="strequentList" msgid="5640192862059373511">"Favourites"</string>
+ <string name="viewContactTitle" msgid="7989394521836644384">"Contact details"</string>
+ <string name="editContactDescription" msgid="2947202828256214947">"Edit contact"</string>
+ <string name="insertContactDescription" msgid="4709878105452681987">"Create contact"</string>
+ <string name="editGroupDescription" msgid="6321161304201540561">"Edit group"</string>
+ <string name="insertGroupDescription" msgid="5658512271662210139">"Create group"</string>
+ <string name="contactDetailAbout" msgid="5430408883907061400">"About"</string>
+ <string name="contactDetailUpdates" msgid="3780588624763446941">"Updates"</string>
+ <string name="searchHint" msgid="8482945356247760701">"Search contacts"</string>
+ <string name="menu_viewContact" msgid="2795575601596468581">"View contact"</string>
+ <string name="menu_addStar" msgid="2908478235715404876">"Add to favourites"</string>
+ <string name="menu_removeStar" msgid="5844227078364227030">"Remove from favourites"</string>
+ <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Removed from favourites"</string>
+ <string name="description_action_menu_add_star" msgid="3327186327234177456">"Added to favourites"</string>
+ <string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
+ <string name="menu_deleteContact" msgid="6788644058868189393">"Delete"</string>
+ <string name="menu_change_photo" msgid="7769177631511496210">"Change photo"</string>
+ <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Place on Home screen"</string>
+ <string name="menu_call" msgid="3992595586042260618">"Call contact"</string>
+ <string name="menu_sendSMS" msgid="5535886767547006515">"Text contact"</string>
+ <string name="menu_splitAggregate" msgid="8368636463748691868">"Separate"</string>
+ <string name="menu_editGroup" msgid="5062005185370983720">"Edit"</string>
+ <string name="menu_deleteGroup" msgid="3486380004411482874">"Delete"</string>
+ <string name="menu_new_contact_action_bar" msgid="7263362129442119188">"Add Contact"</string>
+ <string name="menu_new_group_action_bar" msgid="3520232877587377175">"Add Group"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Separate contact?"</string>
+ <string name="splitConfirmation" msgid="740190210499587175">"This contact will be separated into multiple contacts."</string>
+ <string name="menu_joinAggregate" msgid="4050157483569357666">"Merge"</string>
+ <string name="titleJoinContactDataWith" msgid="7684875775798635354">"Join contacts"</string>
+ <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Choose the contact that you want to join with <xliff:g id="NAME">%s</xliff:g>:"</string>
+ <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Show all contacts"</string>
+ <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Suggested Contacts"</string>
+ <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"All contacts"</string>
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contacts merged"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contacts deleted"</string>
+ <string name="menu_set_ring_tone" msgid="8728345772068064946">"Set ringtone"</string>
+ <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"All calls to voicemail"</string>
+ <string name="readOnlyContactWarning" msgid="7808825687289848259">"You can\'t delete contacts from read-only accounts, but you can hide them in your contacts lists."</string>
+ <string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"This contact contains information from multiple accounts. Information from read-only accounts will be hidden in your contacts lists, not deleted."</string>
+ <string name="batch_merge_single_contact_warning" msgid="982585201970392110">"You need at least two contacts selected to perform a merge."</string>
+ <string name="batch_merge_confirmation" msgid="8551299480317422420">"The selected contacts will be merged into a single contact."</string>
+ <string name="batch_delete_confirmation" msgid="2564172328268885394">"The selected contacts will be deleted."</string>
+ <string name="batch_delete_read_only_contact_confirmation" msgid="6614878716815412523">"Information from read-only accounts will be hidden in your contacts lists, not deleted."</string>
+ <string name="batch_delete_multiple_accounts_confirmation" msgid="5189722181586680185">"These contacts contain information from multiple accounts. Information from read-only accounts will be hidden in your contacts lists, not deleted."</string>
+ <string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Deleting this contact will delete information from multiple accounts."</string>
+ <string name="deleteConfirmation" msgid="811706994761610640">"This contact will be deleted."</string>
+ <string name="menu_discard" msgid="6854657936970228164">"Discard changes"</string>
+ <string name="invalidContactMessage" msgid="8215051456181842274">"The contact doesn\'t exist."</string>
+ <string name="createContactShortcutSuccessful" msgid="7874133287558150877">"Contact widget added to Home screen."</string>
+ <string name="pickerNewContactHeader" msgid="7750705279843568147">"Create new contact"</string>
+ <string name="pickerNewContactText" msgid="6166997164401048211">"Create new contact"</string>
+ <string-array name="otherLabels">
+ <item msgid="8287841928119937597">"Organisation"</item>
+ <item msgid="7196592230748086755">"Note"</item>
+ </string-array>
+ <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"No pictures are available on the tablet."</string>
+ <string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"No pictures are available on the phone."</string>
+ <string name="attach_photo_dialog_title" msgid="5599827035558557169">"Contact photo"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Custom label name"</string>
+ <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Send calls directly to voicemail"</string>
+ <string name="removePhoto" msgid="4898105274130284565">"Remove photo"</string>
+ <string name="noContacts" msgid="8579310973261953559">"No contacts."</string>
+ <string name="noGroups" msgid="8614664663561385253">"No groups."</string>
+ <string name="noAccounts" msgid="7768267764545265909">"To create groups you need an account."</string>
+ <string name="emptyGroup" msgid="7502116218697177370">"No people in this group."</string>
+ <string name="addPeopleToGroup" msgid="7879585947222263516">"To add some, edit the group."</string>
+ <string name="savingContact" msgid="4075751076741924939">"Saving contact…"</string>
+ <string name="contactSavedToast" msgid="7152589189385441091">"Contact saved."</string>
+ <string name="contactSavedErrorToast" msgid="3207250533172944892">"Couldn\'t save contact changes."</string>
+ <string name="groupSavedToast" msgid="1168756874239833756">"Group saved."</string>
+ <string name="groupSavedErrorToast" msgid="7984466936615304740">"Couldn\'t save group changes."</string>
+ <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contacts with phone numbers</item>
+ <item quantity="one">1 contact with phone number</item>
+ </plurals>
+ <string name="listTotalPhoneContactsZero" msgid="6968813857632984319">"No contacts with phone numbers"</string>
+ <plurals name="listFoundAllContacts" formatted="false" msgid="4872115339963093220">
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> found</item>
+ <item quantity="one">1 found</item>
+ </plurals>
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"No contacts"</string>
+ <plurals name="searchFoundContacts" formatted="false" msgid="7223023725334884618">
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> found</item>
+ <item quantity="one">1 found</item>
+ </plurals>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"All contacts"</string>
+ <string name="favorites_tab_label" msgid="1524869648904016414">"Favourites"</string>
+ <string name="callBack" msgid="5498224409038809224">"Call back"</string>
+ <string name="callAgain" msgid="3197312117049874778">"Call again"</string>
+ <string name="returnCall" msgid="8171961914203617813">"Return call"</string>
+ <string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Add \"<xliff:g id="EMAIL">%s</xliff:g>\" to contacts?"</string>
+ <string name="description_contact_photo" msgid="3387458082667894062">"contact photo"</string>
+ <string name="description_plus_button" msgid="515164827856229880">"plus"</string>
+ <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> of <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
+ <string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
+ <string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
+ <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Add phone number"</string>
+ <string name="quickcontact_add_email" msgid="739298028384348482">"Add email"</string>
+ <string name="missing_app" msgid="1466111003546611387">"No app was found to handle this action."</string>
+ <string name="menu_share" msgid="943789700636542260">"Share"</string>
+ <string name="menu_add_contact" msgid="3198704337220892684">"Add to contacts"</string>
+ <string name="share_via" msgid="563121028023030093">"Share contact via"</string>
+ <string name="dialog_new_group_account" msgid="2318032089273496830">"Create group under account"</string>
+ <string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
+ <string name="video_chat" msgid="1872255818640336072">"Video chat"</string>
+ <string name="connections" msgid="8098440723172028350">"Connections"</string>
+ <string name="add_connection_button" msgid="4861308615789601727">"Add connection"</string>
+ <string name="recent" msgid="2659189233141493004">"Recent"</string>
+ <string name="recent_updates" msgid="4267258535615860710">"Recent updates"</string>
+ <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> contact"</string>
+ <!-- no translation found for from_account_format (4469138575127580203) -->
+ <skip />
+ <string name="contact_read_only" msgid="7421346527289472273">"Not editable from this app."</string>
+ <string name="group_read_only" msgid="1061762906115697637">"Not editable on this device"</string>
+ <string name="take_photo" msgid="7496128293167402354">"Take photo"</string>
+ <string name="take_new_photo" msgid="7341354729436576304">"Take new photo"</string>
+ <string name="pick_photo" msgid="2129509985223564942">"Choose photo"</string>
+ <string name="pick_new_photo" msgid="9122450996263688237">"Select new photo"</string>
+ <string name="locale_change_in_progress" msgid="7583992153091537467">"Contact list is being updated to reflect the change of language."</string>
+ <string name="upgrade_in_progress" msgid="474511436863451061">"Contact list is being updated."</string>
+ <string name="search_results_searching" msgid="3984833028938569930">"Searching…"</string>
+ <string name="menu_display_selected" msgid="6470001164297969034">"Show selected"</string>
+ <string name="menu_display_all" msgid="8887488642609786198">"Show all"</string>
+ <string name="menu_select_all" msgid="621719255150713545">"Select all"</string>
+ <string name="menu_select_none" msgid="7093222469852132345">"Unselect all"</string>
+ <string name="add_new_entry_for_section" msgid="5223080690667565044">"Add new"</string>
+ <string name="add_organization" msgid="7311893231158291197">"Add organisation"</string>
+ <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
+ <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Group name"</string>
+ <string name="change_photo" msgid="8530597935483526383">"Change"</string>
+ <string name="primary_photo" msgid="8517942231868516999">"Primary photo"</string>
+ <string name="description_star" msgid="2605854427360036550">"favourite"</string>
+ <string name="edit_contact" msgid="7529281274005689512">"Edit contact"</string>
+ <plurals name="merge_info" formatted="false" msgid="2489323424994280962">
+ <item quantity="other">merged from <xliff:g id="COUNT">%0$d</xliff:g> sources</item>
+ <item quantity="one">not merged</item>
+ </plurals>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Join the current contact with the selected contact?"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Switch to editing the selected contact? Information that you\'ve entered so far will be copied."</string>
+ <string name="menu_copyContact" msgid="1573960845106822639">"Copy to My Contacts"</string>
+ <string name="add_to_my_contacts" msgid="1068274916793627723">"Add to My Contacts"</string>
+ <string name="contact_directory_description" msgid="683398073603909119">"Directory <xliff:g id="TYPE">%1$s</xliff:g>"</string>
+ <string name="list_filter_custom" msgid="8910173055702057002">"Customised"</string>
+ <string name="activity_title_settings" msgid="5464130076132770781">"Settings"</string>
+ <string name="menu_settings" msgid="377929915873428211">"Settings"</string>
+ <string name="menu_help" msgid="1680178646764069976">"Help & feedback"</string>
+ <string name="preference_displayOptions" msgid="1341720270148252393">"Display options"</string>
+ <string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
+ <string name="non_phone_caption" msgid="1541655052330027380">"Phone number"</string>
+ <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Add to contacts"</string>
+ <string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Add to contact"</string>
+ <string name="non_phone_close" msgid="7608506439725515667">"Close"</string>
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Provide a year"</string>
+ <string name="social_widget_label" msgid="6378905543028924592">"Contact"</string>
+ <string name="social_widget_loading" msgid="5327336597364074608">"Loading…"</string>
+ <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Create a new contact"</string>
+ <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Sign in to an account"</string>
+ <string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Import contacts"</string>
+ <string name="create_group_dialog_title" msgid="6874527142828424475">"Create new group"</string>
+ <string name="create_group_item_label" msgid="4411981763169654825">"Create new group"</string>
+ <plurals name="num_groups_in_account" formatted="false" msgid="6189297639209663469">
+ <item quantity="other"><xliff:g id="COUNT">%0$d</xliff:g> groups</item>
+ <item quantity="one">1 group</item>
+ </plurals>
+ <string name="delete_group_dialog_message" msgid="7586856514337560529">"Delete the group \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Contacts themselves will not be deleted.)"</string>
+ <plurals name="num_contacts_in_group" formatted="false" msgid="5520734553286350341">
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> people from <xliff:g id="ACCOUNT_TYPE_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> person from <xliff:g id="ACCOUNT_TYPE_1">%2$s</xliff:g></item>
+ </plurals>
+ <plurals name="group_list_num_contacts_in_group" formatted="false" msgid="8240460423614369023">
+ <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> people</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> person</item>
+ </plurals>
+ <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Type contact name before joining with another."</string>
+ <string name="copy_text" msgid="3257145021583508761">"Copy to clipboard"</string>
+ <string name="set_default" msgid="4417505153468300351">"Set default"</string>
+ <string name="clear_default" msgid="7193185801596678067">"Clear default"</string>
+ <string name="toast_text_copied" msgid="5143776250008541719">"Text copied"</string>
+ <string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Discard your changes?"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="profile_display_name" msgid="4127389543625918771">"Set up my profile"</string>
+ <string name="enter_contact_name" msgid="1738391320566349924">"Type person\'s name"</string>
+ <string name="group_name_hint" msgid="238359485263401293">"Group\'s name"</string>
+ <string name="local_profile_title" msgid="2021416826991393684">"My local profile"</string>
+ <string name="external_profile_title" msgid="8034998767621359438">"My <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> profile"</string>
+ <string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Displaying all contacts"</string>
+ <string name="no_account_prompt" msgid="6424883302325061025">"Contacts works better with a Google Account.\n\n• Access from any web browser.\n• Back up your contacts securely."</string>
+ <string name="generic_no_account_prompt" msgid="7218827704367325460">"Keep your contacts safe even if you lose your phone: synchronise with an online service."</string>
+ <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Add an account"</string>
+ <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Your new contact won\'t be backed up. Add an account that backs up contacts online?"</string>
+ <string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"Your new contact will be synchronised with <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
+ <string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"You can synchronise your new contact with one of the following accounts. Which do you want to use?"</string>
+ <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Add new contact"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit contact"</string>
+ <string name="keep_local" msgid="1258761699192993322">"Keep locally"</string>
+ <string name="add_account" msgid="8201790677994503186">"Add account"</string>
+ <string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
+ <string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
+ <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"add new contact"</string>
+ <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"See more"</string>
+ <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"See less"</string>
+ <string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"See all"</string>
+ <string name="recent_card_title" msgid="8982782042698001695">"Recent"</string>
+ <string name="about_card_title" msgid="2920942314212825637">"About"</string>
+ <string name="send_message" msgid="8938418965550543196">"Send message"</string>
+ <string name="toast_making_personal_copy" msgid="6137651078366797938">"Creating a personal copy..."</string>
+ <string name="yesterday" msgid="6840858548955018569">"Yesterday"</string>
+ <string name="tomorrow" msgid="6241969467795308581">"Tomorrow"</string>
+ <string name="today" msgid="8041090779381781781">"Today"</string>
+ <string name="today_at_time_fmt" msgid="605665249491030460">"Today at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Tomorrow at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="untitled_event" msgid="3484859385405939366">"(Untitled event)"</string>
+ <string name="date_time_set" msgid="4761419824439606690">"Set"</string>
+ <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
+ <string name="header_organization_entry" msgid="8515394955666265406">"Organisation"</string>
+ <string name="header_nickname_entry" msgid="6743561883967451485">"Nickname"</string>
+ <string name="header_note_entry" msgid="4320190426480612344">"Note"</string>
+ <string name="header_website_entry" msgid="1411467850000824745">"Website"</string>
+ <string name="header_event_entry" msgid="6738250422744401460">"Event"</string>
+ <string name="header_relation_entry" msgid="1520292958088146460">"Relation"</string>
+ <string name="header_account_entry" msgid="2684318506427891827">"Account"</string>
+ <string name="header_name_entry" msgid="1592791008096288306">"Name"</string>
+ <string name="header_email_entry" msgid="8666093061171624478">"Email"</string>
+ <string name="header_phone_entry" msgid="8450980572274173570">"Phone"</string>
+ <string name="header_photo_entry" msgid="4438023151411853238">"Photo"</string>
+ <string name="content_description_expand_editor" msgid="1111381475901897470">"Click to expand contact editor."</string>
+ <string name="content_description_collapse_editor" msgid="7598061318022977825">"Click to collapse contact editor."</string>
+ <string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to respond"</string>
+ <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
+ <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"outgoing"</string>
+ <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missed"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to call back"</string>
+ <string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
+ <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field."</string>
+ <string name="compact_editor_more_fields" msgid="2874181192382284115">"More Fields"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a265e28..b9176db 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Show all contacts"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Suggested Contacts"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"All contacts"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contacts merged"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contacts deleted"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Set ringtone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"All calls to voicemail"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"You can\'t delete contacts from read-only accounts, but you can hide them in your contacts lists."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a265e28..b9176db 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Show all contacts"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Suggested Contacts"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"All contacts"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contacts merged"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contacts deleted"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Set ringtone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"All calls to voicemail"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"You can\'t delete contacts from read-only accounts, but you can hide them in your contacts lists."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c2231da..a1e2ba1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos los contactos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contactos fusionados"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contactos eliminados"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Establecer tono"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Llamadas al buzón de voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"No puedes eliminar contactos de cuentas de solo lectura, pero puedes ocultarlos en tus listas de contactos."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c1d2268..61b6548 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos los contactos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contactos combinados"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contactos eliminados"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Establecer tono"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Al buzón de voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"No puedes eliminar los contactos procedentes de las cuentas de solo lectura, pero puedes ocultarlos en las listas de contactos."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 95b666f..ca138cb 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Kuva kõik kontaktid"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Soovitatud kontaktid"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Kõik kontaktid"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktid liideti"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktid kustutati"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Määrake helin"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Kõik kõned kõneposti"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Te ei saa kontakte kirjutuskaitstud kontodest kustutada, kuid saate need oma kontaktide loendis peita."</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 60c03f2..2dad7ba 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Erakutsi kontaktu guztiak"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Gomendatutako kontaktuak"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Kontaktu guztiak"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktuak bateratu dira"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktuak ezabatu dira"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Ezarri tonua"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Erantzungailuko dei guztiak"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Ezin dituzu irakurtzeko soilik diren kontuetako kontaktuak ezabatu, baina zure kontaktuen zerrendatik ezkuta ditzakezu."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index db6476f..d1f9794 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"نمایش همه مخاطبین"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"مخاطبین پیشنهادی"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"همه مخاطبین"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"مخاطبین ادغام شدند"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"مخاطبین حذف شدند"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"تنظیم آهنگ زنگ"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"همه تماسها به پست صوتی"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"شما نمیتوانید مخاطبین را از حسابهای فقط خواندنی حذف کنید اما میتوانید آنها را در لیستهای مخاطبین خود پنهان کنید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c466cc0..c9bbcfe 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Näytä kaikki yhteystiedot"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Ehdotetut yhteystiedot"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Kaikki yhteystiedot"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Yhteystiedot on yhdistetty."</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Yhteystiedot on poistettu."</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Aseta soittoääni"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Kaikki puhelut vastaajaan"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Et voi poistaa yhteystietoja vain luku -tilassa olevista tileistä. Voit kuitenkin piilottaa yhteystietoja yhteystietoluetteloissasi."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index dd4b583..e3a686a 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Afficher tous les contacts"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contacts suggérés"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tous les contacts"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contacts fusionnés"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contacts supprimés"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Régler sonnerie"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Tous appels vers messag. voc."</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Impossible de supprimer les contacts des comptes en lecture seule. Vous pouvez les masquer dans la liste des contacts."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 64cf309..28b06f3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Afficher tous les contacts"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contacts suggérés"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tous les contacts"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Les contacts ont bien été fusionnés."</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Les contacts ont bien été supprimés."</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Régler sonnerie"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Tous appels vers messag. voc."</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Impossible de supprimer les contacts des comptes en lecture seule. Vous pouvez les masquer dans la liste des contacts."</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 1e611c0..ca6fadf 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos os contactos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos suxeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contactos"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contactos combinados"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contactos eliminados"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Definir ton"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas as chamadas a correo voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Non podes eliminar contactos das contas de só lectura, pero podes ocultalos nas túas listas de contactos."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3b5fe43..48e7587 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"सभी संपर्क दिखाएं"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सुझाए गए संपर्क"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"सभी संपर्क"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"संपर्क एक बनाए गए"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"संपर्क हटा दिए गए"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"रिंगटोन सेट करें"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ध्वनिमेल से सभी कॉल"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"आप केवल-पढ़ने के लिए खातों से संपर्क नहीं हटा सकते, लेकिन आप उन्हें अपनी संपर्क सूचियों में छुपा सकते हैं."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 47a286c..40bfe3e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži sve kontakte"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakti su spojeni"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakti su izbrisani"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Postavi zvuk zvona"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi na govornu poštu"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Ne možete izbrisati kontakte s računa samo za čitanje, ali možete ih sakriti na svojim popisima kontakata."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fa320cb..8f010f0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Az összes névjegy megjelenítése"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Javasolt névjegyek"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Összes névjegy"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Névjegyek egyesítve"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Névjegyek törölve"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Csengőhang"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Minden hívás a hangpostára"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Írásvédett fiókból nem törölhet névjegyet, de saját címtárában elrejtheti azokat."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index ec758cd..68a899c 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Ցույց տալ բոլոր կոնտակտները"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Առաջարկվող կոնտակները"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Բոլոր կոնտակտները"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Կոնտակտները միավորվեցին"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Կոնտակտները ջնջվեցին"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Կարգավորել զանգերանգը"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Բոլոր զանգերը՝ ձայնային փոստին"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Դուք չէք կարող ջնջել միայն ընթերցման համար նախատեսված հաշիվների կոնտակտները, սակայն կարող եք ձեր կոնտակտների ցանկից թաքցնել:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 27d1fdf..7e3c061 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Tampilkan semua kontak"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Kontak yang disarankan"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Semua kontak"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontak digabungkan"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontak dihapus"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Setel nada dering"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Panggilan masuk kotak pesan"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Anda tidak dapat menghapus kontak dari akun hanya-baca, namun Anda dapat menyembunyikannya dalam daftar kontak Anda."</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index cfdeaed..362e368 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Sýna alla tengiliði"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Tillögur að tengiliðum"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Allir tengiliðir"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Tengiliðir sameinaðir"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Tengiliðum eytt"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Velja hringitón"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Öll símtöl í talhólf"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Ekki er hægt að eyða tengiliðum af skrifvörðum reikningum en hægt er að fela þá í tengliðalistanum."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 71ef29b..0114638 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostra tutti i contatti"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contatti suggeriti"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tutti i contatti"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contatti uniti"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contatti eliminati"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Imposta suoneria"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Tutte le chiamate a segreteria"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Non puoi eliminare contatti da account di sola lettura, ma puoi nasconderli nei tuoi elenchi di contatti."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 95d09d1..9854965 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"הצג את כל אנשי הקשר"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"אנשי קשר מוצעים"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"כל אנשי הקשר"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"אנשי הקשר שולבו"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"אנשי הקשר נמחקו"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"הגדר רינגטון"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"כל השיחות לתא הקולי"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"לא ניתן למחוק אנשי קשר מחשבונות לקריאה בלבד, אך ניתן להסתיר אותם ברשימות אנשי הקשר."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 20ea297..d94ab9f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"すべての連絡先を表示"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"連絡先候補"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"すべての連絡先"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"連絡先を統合しました"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"連絡先を削除しました"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"着信音を設定"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"すべての通話をボイスメールへ"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"読み取り専用アカウントの連絡先は削除できません。ただし、連絡先リストで非表示にすることができます。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 61400c9..ee5d330 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"ყველა კონტაქტის ჩვენება"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"შემოთავაზებული კონტაქტები"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"ყველა კონტაქტი"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"კონტაქტები გაერთიანდა"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"კონტაქტები წაიშალა"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ზარის დაყენება"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ყველა ზარი ხმოვან ფოსტაში"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"მხოლოდ კითხვადი ანგარიშებიდან კონტაქტების წაშლა შეუძლებელია, თუმცა შეგიძლიათ დამალოთ ისინი კონტაქტების სიაში."</string>
@@ -214,7 +212,7 @@
<string name="toast_text_copied" msgid="5143776250008541719">"კოპირებული ტექსტი"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"გსურთ ცვლილებების გაუქმება?"</string>
<string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
- <string name="profile_display_name" msgid="4127389543625918771">"ჩემი პროფილის პარამეტრების დაყენება"</string>
+ <string name="profile_display_name" msgid="4127389543625918771">"პროფ. დაყენება"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"აკრიფეთ კონტაქტის სახელი"</string>
<string name="group_name_hint" msgid="238359485263401293">"ჯგუფის სახელი"</string>
<string name="local_profile_title" msgid="2021416826991393684">"ჩემი ადგილობრივი პროფილი"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index ddaa89f..56593e5 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Барлық контактілерді көрсету"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Ұсынылған контактілер"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Барлық контактілер"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контактілер біріктірілді"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контактілер жойылды"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Рингтонды орнату"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Дауыс-хабарына жасалған барлық қоңыраулар"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Оқу үшін ғана есептік жазбаларындағы контактілерді жою мүмкін болмайды, бірақ контактілер тізімінде жасырып қоюға болады."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f8d9a2e..91bf8b7 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"បង្ហាញទំនាក់ទំនងទាំងអស់"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"ទំនាក់ទំនងដែលបានស្នើ"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"ទំនាក់ទំនងទាំងអស់"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"ទំនាក់ទំនងត្រូវបានរួមបញ្ចូលគ្នា"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ទំនាក់ទំនងត្រូវបានលុប"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"កំណត់សំឡេងរោទ៍"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ការហៅទាំងអស់ទៅសារជាសំឡេង"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"អ្នកមិនអាចលុបទំនាក់ទំនងពីគណនីបានតែអានទេ ប៉ុន្តែអ្នកអាចលាក់ពួកវានៅក្នុងបញ្ជីទំនាក់ទំនងរបស់អ្នកបាន។"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index c5b48c4..83426ef 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ತೋರಿಸು"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"ಸೂಚಿಸಲಾದ ಸಂಪರ್ಕಗಳು"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"ಸಂಪರ್ಕಗಳನ್ನು ವಿಲೀನಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ಸಂಪರ್ಕಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ರಿಂಗ್ಟೋನ್ ಹೊಂದಿಸಿ"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ಧ್ವನಿಮೇಲ್ಗೆ ಎಲ್ಲ ಕರೆಗಳು"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"ಓದಲು ಮಾತ್ರ ಖಾತೆಗಳಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ನಿಮಗೆ ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಆದರೆ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಅವುಗಳನ್ನು ನೀವು ಮರೆಮಾಡಬಹುದು."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4e42351..5d05d0f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"모든 연락처 표시"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"추천 연락처"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"모든 연락처"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"연락처가 병합되었습니다."</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"연락처가 삭제되었습니다."</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"벨소리 설정"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"음성사서함 자동 연결"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"연락처를 읽기 전용 계정에서 삭제할 수는 없지만 주소록에서 숨길 수는 있습니다."</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 8633a8f..3cd90ef 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -91,10 +91,8 @@
<skip />
<!-- no translation found for separatorJoinAggregateAll (7939932265026181043) -->
<skip />
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Байланыштар бириктирилди"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Байланыштар жок кылынды"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Рингтон орнотуу"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Үн почтасына бардык чалуулар"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Сиз окуганга гана болгон эсебиңизден байланыштарыңызды өчүрө албайсыз, бирок аларды жашырсаңыз болот."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index d9a17dd..2c270c7 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"ສະແດງລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ແນະນຳ"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"ລວມລາຍຊື່ເຂົ້າກັນແລ້ວ"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ລຶບລາຍຊື່ແລ້ວ"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ຕັ້ງສຽງຣິງໂທນ"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ໂອນທຸກສາຍໄປຂໍ້ຄວາມສຽງ"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"ທ່ານບໍ່ສາມາດລຶບລາຍຊື່ຜູ່ຕິດຕໍ່ຈາກບັນຊີທີ່ອ່ານໄດ້ເທົ່ານັ້ນ ແຕ່ທ່ານສາມາດເຊື່ອງມັນໄວ້ໃນລາຍຊື່ຜູ່ຕິດຕໍ່ຂອງທ່ານ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 945dacf..8408caf 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Rodyti visus adresatus"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Siūlomi adresatai"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Visi adresatai"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktai susieti"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktai ištrinti"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Nustat. sk. toną"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Visi skamb. į balso paštą"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Negalite ištrinti kontaktų iš tik skaitomų paskyrų, bet galite paslėpti juos savo kontaktų sąrašuose."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index bc7fb88..a71b17e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Rādīt visas kontaktpersonas"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Ieteiktās kontaktpersonas"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Visas kontaktpersonas"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktpersonas ir apvienotas."</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktpersonas ir dzēstas."</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Iestatīt zv. signālu"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Visi zvani uz balss pastu"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Jūs nevarat dzēst kontaktpersonas no tikai lasāmiem kontiem, taču varat tās slēpt kontaktpersonu sarakstos."</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 07c1231..2dcc80d 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Прикажи ги сите контакти"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Препорачани контакти"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Сите контакти"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контактите се споени"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контактите се избришани"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Подеси мелодија"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Сите повици кон говорна пошта"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Не можете да избришете контакти од сметки само за читање, но можете да ги сокриете во вашите списоци со контакти."</string>
@@ -190,7 +188,7 @@
<string name="social_widget_label" msgid="6378905543028924592">"Контакт"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"Се вчитува..."</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Создај нов контакт"</string>
- <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Пријави се на сметка"</string>
+ <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Најави се на сметка"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Увези контакти"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Создај нова група"</string>
<string name="create_group_item_label" msgid="4411981763169654825">"Создај нова група"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index bcfc83e..0f9b6f0 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"എല്ലാ കോൺടാക്റ്റുകളും കാണിക്കുക"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"നിര്ദ്ദേശിച്ച കോണ്ടാക്റ്റുകള്"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"കോൺടാക്റ്റുകൾ ലയിപ്പിച്ചു"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"കോൺടാക്റ്റുകൾ ഇല്ലാതാക്കി"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"റിംഗ്ടോൺ സജ്ജമാക്കുക"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"വോയ്സ്മെയിലിലേക്കുള്ള എല്ലാ കോളുകളും"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"വായന-മാത്രം അക്കൗണ്ടുകളിൽ നിന്നുള്ള കോൺടാക്റ്റുകൾ നിങ്ങൾക്ക് ഇല്ലാതാക്കാനാകില്ലെങ്കിലും കോൺടാക്റ്ററ്റ് ലിസ്റ്റുകളിൽ നിന്ന് അവ മറയ്ക്കാനാകും."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index a213642..264dff5 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Бүх харилцагчдыг харуулах"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Санал болгосон харилцагчид"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Бүх харилцагчид"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Холбоо барих хаягуудыг нэгтгэсэн"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Холбоо барих хаягуудыг устгасан"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Хонхны ая суулгах"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Бүх дуудлагыг дуут шуудан руу"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Та зөвхөн-унших акаунтаас харилцагчдыг устгаж чадахгүй, харин харилцагчдын жагсаалтаасаас нууцлаж болно."</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 71bdb8c..598fcfe 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"सर्व संपर्क दर्शवा"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सूचित संपर्क"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"सर्व संपर्क"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"संपर्क विलीन केले"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"संपर्क हटविले"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"रिंगटोन सेट करा"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"व्हॉइसमेलवरील सर्व कॉल"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"आपण केवळ-वाचनीय खात्यांमधून संपर्क हटवू शकत नाही परंतु आपण ते आपल्या संपर्क सूचींमध्ये लपवू शकता."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a1f3417..b40c073 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Tunjukkan semua kenalan"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Kenalan cadangan"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Semua kenalan"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kenalan digabungkan"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kenalan dipadamkan"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Ttpkn nd dering"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Semua panggilan ke mel suara"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Anda tidak boleh memadamkan kenalan daripada akaun baca sahaja, tetapi anda boleh menyembunyikan mereka dalam senarai kenalan anda."</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index aab06ae..6a508bd 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"အဆက်အသွယ်များအားလုံးအားပြပါ"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"အကြုံပြုလိုသော အဆက်အသွယ်များ"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"လိပ်စာများအားလုံး"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"ဆက်သွယ်မှုစာရင်း ပေါင်းကူးပြီး"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ဆက်သွယ်မှုစာရင်း ဖျက်ပြီး"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ဖုန်းမြည်သံသတ်မှတ်ရန်"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"ဖုန်းအားလုံးအသံစာပို့စနစ်သို့"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"ဖတ်ရန်အတွက်သာ အကောင့်များမှ အဆက်အသွယ်များကို ဖျက်ပစ်လို့ မရပါ၊ ဒါပေမယ့် အဆက်အသွယ်များစာရင်းမှ ဖျောက်ထားလို့ ရပါသည်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a099469..94a0e31 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Vis alle kontakter"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Forslag"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle kontakter"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktene er slått sammen"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktene er slettet"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Angi ringetone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle samtaler til talepost"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Du kan ikke slette kontakter fra skrivebeskyttede kontoer, men du kan skjule dem i kontaktlisten."</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 0cc901c..92363a6 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"सबै सम्पर्कहरू देखाउनुहोस्"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सुझाव गरिएका सम्पर्कहरू"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"सबै सम्पर्कहरू"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"सम्पर्कहरू मर्ज गरिए"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"सम्पर्कहरू मेटाइए"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"रिङ्टोन मिलाउनुहोस्"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"भ्वाइसमेलमा सम्पूर्ण कल"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"तपाईँले पढ्ने-मात्र खाताबाट सम्पर्कहरू हटाउन सक्नु हुन्न, तर तपाईँको सम्पर्क सूचीहरूबाट लुकाउन सक्नु हुन्छ।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 26a5138..6c8d36e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Alle contacten weergeven"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Mogelijke contacten"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle contacten"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contacten samengevoegd"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contacten verwijderd"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Beltoon instellen"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle oproepen naar voicemail"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"U kunt contacten niet verwijderen uit alleen-lezen-accounts, maar u kunt ze verbergen in uw contactenlijst."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8b0f7ac..752b117 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Pokaż wszystkie kontakty"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Sugerowane kontakty"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Wszystkie kontakty"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakty zostały scalone"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakty zostały usunięte"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Ustaw dzwonek"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Łącz na pocztę głosową"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Nie możesz usunąć kontaktów z kont tylko do odczytu, ale możesz ukryć je na swoich listach kontaktów."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b6b7573..c42e79b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos os contactos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contactos"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contactos unidos"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contactos eliminados"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Definir toque"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas as cham. p/ correio voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Não pode eliminar contactos de contas só de leitura, mas pode ocultá-los nas suas listas de contactos."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d82b0db..e56a6ee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos os contatos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contatos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contatos"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Contatos mesclados"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Contatos excluídos"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Definir toque"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas as cham. p/ correio voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Não é possível excluir os contatos das contas somente leitura, mas você pode ocultá-los nas suas listas de contatos."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4c0d385..f123c48 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Afişaţi toate persoanele din agendă"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Persoane din agendă sugerate"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Toate persoanele din agendă"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Persoane de contact îmbinate"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Persoane de contact șterse"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Setaţi ton apel"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Toate apel. către mesag. voc."</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Nu puteţi şterge persoane din agendă, din conturi cu permisiuni doar de citire, însă puteţi să le ascundeţi în lista dvs. de persoane din agendă."</string>
@@ -130,7 +128,7 @@
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> din <xliff:g id="TOTAL_NUMBER">%s</xliff:g> (de) persoane din agendă"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Numele persoanelor din agenda dvs."</string>
- <string name="quickcontact_missing_app" msgid="358168575340921552">"Nu s-a găsit o aplicaţie care să gestioneze această acţiune."</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"Nu s-a găsit o aplicație care să gestioneze această acţiune."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Dați clic pentru a reveni la ecranul anterior"</string>
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"Adăugați un număr de telefon"</string>
<string name="quickcontact_add_email" msgid="739298028384348482">"Adăugaţi o adresă de e-mail"</string>
@@ -148,7 +146,7 @@
<string name="account_type_format" msgid="718948015590343010">"Persoana din agendă din <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
- <string name="contact_read_only" msgid="7421346527289472273">"Nu se poate edita din această aplicaţie"</string>
+ <string name="contact_read_only" msgid="7421346527289472273">"Nu se poate edita din această aplicație"</string>
<string name="group_read_only" msgid="1061762906115697637">"Nu poate fi editat pe acest dispozitiv."</string>
<string name="take_photo" msgid="7496128293167402354">"Fotografiaţi"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Creaţi o fotografie nouă"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dc9a789..6fe02cd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Показать все контакты"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Предлагаемые контакты"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Все контакты"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контакты объединены"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контакты удалены"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Задать рингтон"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Только голос. почта"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Невозможно удалить контакты из аккаунта, доступного только для чтения, однако их можно скрыть в списках контактов."</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index a881668..593ed6a 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"සියලු සම්බන්ධතා පෙන්වන්න"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"යෝජිත සම්බන්ධතා"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"සියලුම සම්බන්ධතා"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"සම්බන්ධතා ඒකාබද්ධ කරන ලදි"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"සම්බන්ධතා ඉවත් කරන ලදි"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"රිංග්ටෝනය සකසන්න"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"හඬ තැපෑල වෙත සියලු ඇමතුම්"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"ඔබට සම්බන්ධතා කියවීමට-පමණයි ගිණුම් වලින් මැකිය නොහැක, නමුත් ඔබගේ සම්බන්ධතා ලැයිස්තු තුළ ඔබට ඒවා සැඟවිය හැක."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 900bdba..54da6b5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Zobraziť všetky kontakty"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Navrhnuté kontakty"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Všetky kontakty"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakty boli zlúčené"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakty boli odstránené"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Nastaviť zvonenie"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Všetky hovory do hl. schránky"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Z účtov, ktoré sú iba na čítanie, nie je možné odstrániť kontakty. Tieto kontakty však môžete v zozname kontaktov skryť."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ab5f362..f0d15e5 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži vse stike"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predlagani stiki"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Vsi stiki"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Stika sta bila združena"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Stiki so bili izbrisani"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Nastavi zvonj."</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Vsi klici na odzivnik"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Iz računov samo za branje stikov ni mogoče izbrisati, lahko pa jih skrijete na seznamih stikov."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d4109d0..ebeb86e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Прикажи све контакте"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Предложени контакти"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Сви контакти"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контакти су обједињени"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контакти су избрисани"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Подеси мелодију звона"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Сви позиви у говорну пошту"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Контакте у оквиру налога који су само за читање не можете да избришете, али можете да их сакријете на листи контаката."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 864c161..1d0dc97 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Visa alla kontakter"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Föreslagna kontakter"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alla kontakter"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontakterna har sammanfogats"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontakterna har raderats"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Ställ in ringsignal"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alla samtal till röstbrevlådan"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Du kan inte ta bort kontakter från skrivskyddade konton, men du kan dölja dem i kontaktlistorna."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 78f2c17..0ff2b45 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Onyesha anwani zote"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Anwani zilizopendekezwa"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Anwani zote"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Anwani zimeunganishwa"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Anwani zimefutwa"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Weka mlio wa simu"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Simu zijibiwe kwa ujumbe-sauti"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Huwezi kufuta anwani kutoka kwa akaunti ya kusoma-tu, lakini unaweza kuzificha katika orodha zako za anwani."</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 1fe4138..b0356e0 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"எல்லா தொடர்புகளையும் காட்டு"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"பரிந்துரைக்கப்பட்ட தொடர்புகள்"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"எல்லா தொடர்புகளும்"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"தொடர்புகள் இணைக்கப்பட்டன"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"தொடர்புகள் நீக்கப்பட்டன"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ரிங்டோனை அமை"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"எல்லா அழைப்புகளையும் குரலஞ்சலிற்கு திருப்பு"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"படிக்க மட்டுமேயான கணக்குகளின் தொடர்புகளை நீக்க முடியாது, ஆனால் தொடர்புகள் பட்டியல்களில் அவற்றை மறைக்கலாம்."</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 564df76..7120de8 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"అన్ని పరిచయాలను చూపు"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"సూచిత పరిచయాలు"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"అన్ని పరిచయాలు"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"పరిచయాలు విలీనం చేయబడ్డాయి"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"పరిచయాలు తొలగించబడ్డాయి"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"రింగ్టోన్ను సెట్ చేయి"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"అన్ని కాల్లు వాయిస్ మెయిల్కు"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"మీరు చదవడానికి-మాత్రమే అనుమతి ఉన్న ఖాతాల నుండి పరిచయాలను తొలగించలేరు, కానీ వాటిని మీ పరిచయాల జాబితాల్లో దాచవచ్చు."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ffd5426..44f99bc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"แสดงรายชื่อในสมุดโทรศัพท์ทั้งหมด"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"รายชื่อที่แนะนำ"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"รายชื่อในสมุดโทรศัพท์ทั้งหมด"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"รวมรายชื่อติดต่อแล้ว"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"ลบรายชื่อติดต่อแล้ว"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ตั้งเสียงเรียกเข้า"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"โอนทุกสายไปยังข้อความเสียง"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"คุณไม่สามารถลบรายชื่อติดต่อจากบัญชีแบบอ่านอย่างเดียวได้ แต่ซ่อนไว้ในรายการรายชื่อได้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 340f6a2..8e2dd70 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Ipakita ang lahat ng mga contact"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Mga iminumungkahing contact"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Lahat ng mga contact"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Pinagsama ang mga contact"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Na-delete ang mga contact"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Itakda ang ringtone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Lahat ng tawag sa voicemail"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Hindi ka makakapagtanggal ng mga contact mula sa mga read-only na account, ngunit maitatago mo ang mga ito sa iyong mga listahan ng mga contact."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1c74d61..4bdbae5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Tüm kişileri göster"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Önerilen kişiler"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tüm kişiler"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kişiler birleştirildi"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kişiler silindi"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Zil sesi ayarla"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Tüm çağrıları sesli mesaja"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Kişileri salt okunur hesaplardan silemezsiniz, ancak bu kişileri kişiler listenizde gizleyebilirsiniz."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 447f2b9..3f0a3f3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Показ. всі контакти"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Пропоновані контакти"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Усі контакти"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Контакти об’єднано"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Контакти видалено"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Мелодія"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Усі виклики на голосову пошту"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Неможливо видалити контакти з облікових записів \"лише для читання\", але можна сховати їх у списках контактів."</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 226cbe9..a1f0d5d 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"سبھی رابطے دکھائیں"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"مجوزہ رابطے"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"سبھی رابطے"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"رابطے ضم کر دیے گئے"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"رابطے حذف کر دیے گئے"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"رنگ ٹون طے کریں"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"صوتی میل پر سبھی کالیں"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"آپ صرف پڑھنے کے اکاؤنٹس سے رابطوں کو حذف نہیں کر سکتے ہیں لیکن آپ اپنے رابطوں کی فہرست میں انہیں چھپا سکتے ہیں۔"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index d5448e0..0711c17 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Barcha kontaktlarni ko‘rsatish"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Tavsiya qilingan kontaktlar"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Barcha kontaktlar"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Kontaktlar birlashtirildi"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Kontaktlar o\'chirildi"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Qo‘ng‘iroq ohangini o‘rnatish"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Barcha qo‘n-lar ovozli xabarga"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Faqat o‘qishga ruxsat etilgan hisoblar kontaktlarini o‘chira olmaysiz, ammo ularni kontaktlaringiz ro‘yxatida ko‘rinmaydigan qila olasiz."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 076800c..81e3f35 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Hiển thị tất cả liên hệ"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Liên hệ được đề xuất"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Tất cả liên hệ"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Đã hợp nhất các địa chỉ liên hệ"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Đã xóa các địa chỉ liên hệ"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Đặt nhạc chuông"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Các cuộc gọi tới thư thoại"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Bạn không thể xóa địa chỉ liên hệ từ tài khoản chỉ đọc, nhưng bạn có thể ẩn chúng trong danh sách địa chỉ liên hệ của mình."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index dc5b605..022fdeb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"显示所有联系人"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"建议的联系人"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"所有联系人"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"已合并联系人"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"已删除联系人"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"设置铃声"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"所有来电转至语音信箱"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"您无法删除只读帐户中的联系人，但可以在联系人列表中将他们隐藏。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fdfacfa..0acdf35 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"顯示所有聯絡人"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"建議的聯絡人"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"所有聯絡人"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"已合併聯絡人"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"已刪除聯絡人"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"設定鈴聲"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"所有來電轉到留言信箱"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"您無法刪除唯讀帳戶的聯絡人，但可在聯絡人名單中隱藏這些聯絡人。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7c2b614..0e37676 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"顯示所有聯絡人"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"建議聯絡人"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"所有聯絡人"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"已合併聯絡人"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"已刪除聯絡人"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"設定電話鈴聲"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"將所有來電轉到語音信箱"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"您無法刪除唯讀帳戶的聯絡人，但可在聯絡人清單中隱藏這些聯絡人。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ac215c5..8df1d98 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -63,10 +63,8 @@
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Bonakalisa bonke othintana nabo"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Othintana nabo abasikiselwayo"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Bonke othintana nabo"</string>
- <!-- no translation found for contactsJoinedMessage (656936718666768589) -->
- <skip />
- <!-- no translation found for contacts_deleted_toast (286851430992788215) -->
- <skip />
+ <string name="contactsJoinedMessage" msgid="656936718666768589">"Oxhumana nabo bahlanganisiwe"</string>
+ <string name="contacts_deleted_toast" msgid="286851430992788215">"Oxhumana nabo basusiwe"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Hlela iringithoni"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Wonke amakholi aya kwimeyili yezwi"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Awukwazi ukususa othintana nabo ema-akhawuntini okufunda kuphela, kodwa ungabafihla ohlwini lwakho loxhumana nabo."</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cb658b3..a537a95 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,6 +62,6 @@
<!-- Color of the mime-type icons inside the editor. 50% black. -->
<color name="editor_icon_color">#7f7f7f</color>
- <!-- Color of disabled text and unfocused hint text inside the contact editor. -->
- <color name="editor_disabled_text_color">#989898</color>
+ <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
+ <color name="editor_disabled_text_color">#40000000</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a6afca6..2214215 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,14 +33,18 @@
snaps to the top of the window. -->
<dimen name="quickcontact_snap_to_top_slop_height">33dp</dimen>
+ <!-- The ratio of width:height (360:184) for the compact editor contact photo in portrait -->
+ <item name="editor_portrait_photo_ratio" type="dimen" format="float">1.96</item>
+
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
<dimen name="editor_round_button_padding_left">16dip</dimen>
<dimen name="editor_round_button_padding_right">16dip</dimen>
<dimen name="editor_round_button_padding_top">16dip</dimen>
<dimen name="editor_round_button_padding_bottom">16dip</dimen>
- <!-- Minimum height of a row in the Editor -->
- <dimen name="editor_min_line_item_height">48dip</dimen>
+ <!-- Minimum height of a row in the Editor. This is the target height for editor "rows",
+ including the "More fields" button/row. -->
+ <dimen name="editor_min_line_item_height">54dp</dimen>
<!-- Width of the delete button (X) in the raw contact editor -->
<dimen name="editor_delete_button_width">48dp</dimen>
@@ -69,21 +73,21 @@
<dimen name="editor_kind_icon_total_width">68dp</dimen>
<!-- Padding below every editor view, such as LabeledEditorView. This value is chosen
- to give 32dp of apparent padding between EditText's in the Raw Contact Editor. -->
- <dimen name="editor_padding_between_editor_views">15dp</dimen>
+ to give 19dp of apparent padding between EditText's in the Raw Contact Editor. -->
+ <dimen name="editor_padding_between_editor_views">2dp</dimen>
- <!-- Padding below every readonly editor view. This value is chosen to give 32dp of apparent padding
- between TextView's in the readonly Raw Contact Editor. -->
- <dimen name="editor_padding_between_read_only_editor_views">25dp</dimen>
+ <!-- Padding below every readonly editor view. This value is chosen to give 19dp of apparent
+ padding between TextView's in the readonly Raw Contact Editor. -->
+ <dimen name="editor_padding_between_read_only_editor_views">9dp</dimen>
- <!-- Padding above and below the photo editor. This value is chosen to give 32dp of apparent
+ <!-- Padding above and below the photo editor. This value is chosen to give 19dp of apparent
padding between TextView's and the photo's ImageView. -->
- <dimen name="editor_padding_around_read_only_photo_editor">28dp</dimen>
+ <dimen name="editor_padding_around_read_only_photo_editor">15dp</dimen>
<!-- Padding below the photo editor. This value is larger than
editor_padding_between_editor_views, since ImageView's don't have space between the bottom
of their visual bottom, like an EditText does. -->
- <dimen name="editor_padding_below_photo">21dp</dimen>
+ <dimen name="editor_padding_below_photo">9dp</dimen>
<!-- Width of the Type-Label in the Editor -->
<dimen name="editor_type_label_width">150dip</dimen>
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index d81867c..4c3671f 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -330,6 +330,9 @@
Intent callbackIntent = new Intent(context, callbackActivity);
callbackIntent.putExtra(saveModeExtraKey, saveMode);
callbackIntent.setAction(callbackAction);
+ if (updatedPhotos != null) {
+ callbackIntent.putExtra(EXTRA_UPDATED_PHOTOS, (Parcelable) updatedPhotos);
+ }
serviceIntent.putExtra(ContactSaveService.EXTRA_CALLBACK_INTENT, callbackIntent);
}
return serviceIntent;
@@ -384,6 +387,9 @@
Cursor c = resolver.query(Profile.CONTENT_URI,
new String[] {Contacts._ID, Contacts.LOOKUP_KEY},
null, null, null);
+ if (c == null) {
+ continue;
+ }
try {
if (c.moveToFirst()) {
final long contactId = c.getLong(0);
@@ -398,7 +404,9 @@
rawContactId);
lookupUri = RawContacts.getContactLookupUri(resolver, rawContactUri);
}
- Log.v(TAG, "Saved contact. New URI: " + lookupUri);
+ if (lookupUri != null) {
+ Log.v(TAG, "Saved contact. New URI: " + lookupUri);
+ }
// We can change this back to false later, if we fail to save the contact photo.
succeeded = true;
diff --git a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
index e3fa7e2..f4e8c78 100644
--- a/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
+++ b/src/com/android/contacts/activities/ConfirmAddDetailActivity.java
@@ -495,6 +495,9 @@
if (photoId == 0) {
mContactId = cursor.getLong(ContactQuery._ID);
startDisambiguationQuery(mDisplayName);
+ } else if (TextUtils.isEmpty(mLookupKey)) {
+ finish();
+ return;
} else {
// Otherwise do the photo query.
Uri lookupUri = Contacts.getLookupUri(mContactId, mLookupKey);
diff --git a/src/com/android/contacts/activities/ContactEditorBaseActivity.java b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
index 25846bc..ec2f9b6 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -35,7 +35,6 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.RawContacts;
import android.util.Log;
@@ -161,7 +160,7 @@
* Invoked after the contact is saved.
*/
void onSaveCompleted(boolean hadChanges, int saveMode, boolean saveSucceeded,
- Uri contactLookupUri);
+ Uri contactLookupUri, Bundle updatedPhotos);
/**
* Invoked after the contact is joined.
@@ -238,7 +237,8 @@
intent.getIntExtra(ContactEditorFragment.SAVE_MODE_EXTRA_KEY,
ContactEditor.SaveMode.CLOSE),
intent.getBooleanExtra(ContactSaveService.EXTRA_SAVE_SUCCEEDED, false),
- intent.getData());
+ intent.getData(),
+ (Bundle) intent.getParcelableExtra(ContactSaveService.EXTRA_UPDATED_PHOTOS));
} else if (ACTION_JOIN_COMPLETED.equals(action)) {
mFragment.onJoinCompleted(intent.getData());
}
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index da5bb9d..8277cdd 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -31,6 +31,7 @@
import android.provider.ContactsContract.PhoneLookup;
import android.provider.ContactsContract.RawContacts;
import android.telecom.PhoneAccount;
+import android.text.TextUtils;
import android.util.Log;
import com.android.contacts.common.ContactsUtils;
@@ -170,7 +171,7 @@
cursor.close();
}
- if (count == 1 && contactId != -1) {
+ if (count == 1 && contactId != -1 && !TextUtils.isEmpty(lookupKey)) {
// If we only found one item, jump right to viewing it
final Uri contactUri = Contacts.getLookupUri(contactId, lookupKey);
final Intent viewIntent = new Intent(Intent.ACTION_VIEW, contactUri);
diff --git a/src/com/android/contacts/editor/AggregationSuggestionView.java b/src/com/android/contacts/editor/AggregationSuggestionView.java
index a3d04e4..e3bab7e 100644
--- a/src/com/android/contacts/editor/AggregationSuggestionView.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionView.java
@@ -20,6 +20,7 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.provider.ContactsContract.Contacts;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -138,6 +139,9 @@
public boolean handleItemClickEvent() {
if (mListener != null && isEnabled()) {
if (canEditSuggestedContact()) {
+ if (TextUtils.isEmpty(mLookupKey)) {
+ return false;
+ }
mListener.onEditAction(Contacts.getLookupUri(mContactId, mLookupKey));
} else {
ArrayList<Long> rawContactIds = Lists.newArrayList();
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 9a96262..dee322d 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -52,7 +52,6 @@
private static final String KEY_PHOTO_URI = "photo_uri";
private static final String KEY_PHOTO_RAW_CONTACT_ID = "photo_raw_contact_id";
- private static final String KEY_UPDATED_PHOTOS = "updated_photos";
/**
* Displays a PopupWindow with photo edit options.
@@ -68,6 +67,9 @@
public void onRemovePictureChosen() {
getContent().setPhoto(/* bitmap =*/ null);
mUpdatedPhotos.remove(String.valueOf(mPhotoRawContactId));
+
+ // Update the mode so the options change if user clicks the photo again
+ mPhotoMode = getPhotoMode();
}
@Override
@@ -78,10 +80,17 @@
}
getContent().setPhoto(bitmap);
+ // Clear any previously saved full resolution photos under negative raw contact IDs
+ // so that we will use the newly selected photo, instead of an old one on rotations.
+ removeNewRawContactPhotos();
+
// If a new photo was chosen but not yet saved,
// we need to update the UI immediately
mUpdatedPhotos.putParcelable(String.valueOf(mPhotoRawContactId), uri);
getContent().setFullSizePhoto(uri);
+
+ // Update the mode so the options change if user clicks the photo again
+ mPhotoMode = getPhotoMode();
}
@Override
@@ -129,8 +138,6 @@
private PhotoHandler mPhotoHandler;
private Uri mPhotoUri;
private long mPhotoRawContactId;
- private Bundle mUpdatedPhotos = new Bundle();
- private boolean mShowToastAfterSave = true;
@Override
public void onCreate(Bundle savedState) {
@@ -139,7 +146,6 @@
if (savedState != null) {
mPhotoUri = savedState.getParcelable(KEY_PHOTO_URI);
mPhotoRawContactId = savedState.getLong(KEY_PHOTO_RAW_CONTACT_ID);
- mUpdatedPhotos = savedState.getParcelable(KEY_UPDATED_PHOTOS);
}
}
@@ -157,7 +163,6 @@
public void onSaveInstanceState(Bundle outState) {
outState.putParcelable(KEY_PHOTO_URI, mPhotoUri);
outState.putLong(KEY_PHOTO_RAW_CONTACT_ID, mPhotoRawContactId);
- outState.putParcelable(KEY_UPDATED_PHOTOS, mUpdatedPhotos);
super.onSaveInstanceState(outState);
}
@@ -184,26 +189,6 @@
}
@Override
- public void onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
- menu.findItem(R.id.menu_change_photo).setVisible(true);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (super.onOptionsItemSelected(item)) {
- return true;
- }
- if (item.getItemId() == R.id.menu_change_photo) {
- if (mPhotoHandler != null) {
- mPhotoHandler.onClick(/* view =*/ null);
- }
- return true;
- }
- return false;
- }
-
- @Override
protected void bindEditors() {
if (!isReadyToBindEditors()) {
return;
@@ -217,7 +202,19 @@
// Set up the photo widget
mPhotoHandler = createPhotoHandler();
mPhotoRawContactId = editorView.getPhotoRawContactId();
- if (mUpdatedPhotos.containsKey(String.valueOf(mPhotoRawContactId))) {
+ if (mPhotoRawContactId < 0) {
+ // Since the raw contact IDs for new contacts are random negative numbers
+ // we consider any negative key a match
+ for (String key : mUpdatedPhotos.keySet()) {
+ try {
+ if (Integer.parseInt(key) < 0) {
+ editorView.setFullSizePhoto((Uri) mUpdatedPhotos.getParcelable(key));
+ break;
+ }
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ } else if (mUpdatedPhotos.containsKey(String.valueOf(mPhotoRawContactId))) {
editorView.setFullSizePhoto((Uri) mUpdatedPhotos.getParcelable(
String.valueOf(mPhotoRawContactId)));
}
@@ -255,6 +252,10 @@
}
private PhotoHandler createPhotoHandler() {
+ return new PhotoHandler(getActivity(), getPhotoMode(), mState);
+ }
+
+ private int getPhotoMode() {
// To determine the options that are available to the user to update their photo
// (i.e. the photo mode), check if any of the writable raw contacts has a photo set
Integer photoMode = null;
@@ -278,8 +279,7 @@
photoMode = hasWritableAccountType
? PhotoActionPopup.Modes.NO_PHOTO : PhotoActionPopup.Modes.READ_ONLY_PHOTO;
}
-
- return new PhotoHandler(getActivity(), photoMode, mState);
+ return photoMode;
}
@Override
@@ -293,11 +293,6 @@
}
@Override
- protected boolean showToastAfterSave() {
- return mShowToastAfterSave;
- }
-
- @Override
protected boolean doSaveAction(int saveMode) {
// Save contact. No need to pass the palette since we are finished editing after the save.
final Intent intent = ContactSaveService.createSaveContactIntent(mContext, mState,
@@ -356,7 +351,7 @@
// Prepare an Intent to start the expanded editor
final Intent intent = isInsert
- ? EditorIntents.createInsertContactIntent(mState, getDisplayName())
+ ? EditorIntents.createInsertContactIntent(mState, getDisplayName(), mUpdatedPhotos)
: EditorIntents.createEditContactIntent(mLookupUri, getMaterialPalette());
ImplicitIntentsUtil.startActivityInApp(getActivity(), intent);
diff --git a/src/com/android/contacts/editor/CompactPhotoEditorView.java b/src/com/android/contacts/editor/CompactPhotoEditorView.java
index c4ece0d..7483af6 100644
--- a/src/com/android/contacts/editor/CompactPhotoEditorView.java
+++ b/src/com/android/contacts/editor/CompactPhotoEditorView.java
@@ -25,6 +25,7 @@
import com.android.contacts.common.model.ValuesDelta;
import com.android.contacts.common.model.dataitem.DataKind;
import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
import com.android.contacts.editor.CompactContactEditorFragment.PhotoHandler;
import com.android.contacts.util.ContactPhotoUtils;
import com.android.contacts.util.SchedulingUtils;
@@ -33,6 +34,7 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.drawable.GradientDrawable;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Photo;
@@ -43,12 +45,12 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
-import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
/**
* Displays the primary photo.
*/
-public class CompactPhotoEditorView extends LinearLayout implements View.OnClickListener {
+public class CompactPhotoEditorView extends RelativeLayout implements View.OnClickListener {
private static final String TAG = CompactContactEditorFragment.TAG;
@@ -56,13 +58,16 @@
private PhotoHandler mPhotoHandler;
private final float mLandscapePhotoRatio;
+ private final float mPortraitPhotoRatio;
private final boolean mIsTwoPanel;
private ValuesDelta mValuesDelta;
private boolean mReadOnly;
private boolean mIsPhotoSet;
+ private MaterialPalette mMaterialPalette;
private QuickContactImageView mPhotoImageView;
+ private View mPhotoIconOverlay;
public CompactPhotoEditorView(Context context) {
this(context, null);
@@ -70,29 +75,33 @@
public CompactPhotoEditorView(Context context, AttributeSet attrs) {
super(context, attrs);
-
- final TypedValue landscapePhotoRatio = new TypedValue();
- getResources().getValue(R.dimen.quickcontact_landscape_photo_ratio, landscapePhotoRatio,
- /* resolveRefs =*/ true);
- mLandscapePhotoRatio = landscapePhotoRatio.getFloat();
+ mLandscapePhotoRatio = getTypedFloat(R.dimen.quickcontact_landscape_photo_ratio);
+ mPortraitPhotoRatio = getTypedFloat(R.dimen.editor_portrait_photo_ratio);
mIsTwoPanel = getResources().getBoolean(R.bool.quickcontact_two_panel);
}
+ private float getTypedFloat(int resourceId) {
+ final TypedValue typedValue = new TypedValue();
+ getResources().getValue(resourceId, typedValue, /* resolveRefs =*/ true);
+ return typedValue.getFloat();
+ }
+
@Override
protected void onFinishInflate() {
super.onFinishInflate();
mContactPhotoManager = ContactPhotoManager.getInstance(getContext());
mPhotoImageView = (QuickContactImageView) findViewById(R.id.photo);
- mPhotoImageView.setOnClickListener(this);
+ mPhotoIconOverlay = findViewById(R.id.photo_icon_overlay);
+ findViewById(R.id.photo_touch_intercept_overlay).setOnClickListener(this);
}
public void setValues(DataKind dataKind, ValuesDelta valuesDelta,
- RawContactDelta rawContactDelta, boolean readOnly,
- MaterialColorMapUtils.MaterialPalette materialPalette,
+ RawContactDelta rawContactDelta, boolean readOnly, MaterialPalette materialPalette,
ViewIdGenerator viewIdGenerator) {
mValuesDelta = valuesDelta;
mReadOnly = readOnly;
+ mMaterialPalette = materialPalette;
setId(viewIdGenerator.getId(rawContactDelta, dataKind, valuesDelta, /* viewIndex =*/ 0));
@@ -126,12 +135,13 @@
}
}
- if (!mIsPhotoSet) {
- final int color = materialPalette == null
- ? MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(
- getResources()).mPrimaryColor
- : materialPalette.mPrimaryColor;
- mPhotoImageView.setTint(color);
+ if (mIsPhotoSet) {
+ // Add background color behind the white photo icon so that it's visible even
+ // if the contact photo is white.
+ mPhotoIconOverlay.setBackground(new GradientDrawable(
+ GradientDrawable.Orientation.TOP_BOTTOM, new int[]{0, 0x88000000}));
+ } else {
+ setDefaultPhotoTint();
}
// Adjust the photo dimensions following the same logic as in
@@ -139,16 +149,15 @@
SchedulingUtils.doOnPreDraw(this, /* drawNextFrame =*/ false, new Runnable() {
@Override
public void run() {
-
final int photoHeight, photoWidth;
if (mIsTwoPanel) {
// Make the photo slightly more narrow than it is tall
photoHeight = getHeight();
photoWidth = (int) (photoHeight * mLandscapePhotoRatio);
} else {
- // Make the photo a square
- photoHeight = getWidth();
- photoWidth = photoHeight;
+ // Make the photo slightly shorter that it is wide
+ photoWidth = getWidth();
+ photoHeight = (int) (photoWidth / mPortraitPhotoRatio);
}
final ViewGroup.LayoutParams layoutParams = getLayoutParams();
layoutParams.height = photoHeight;
@@ -216,10 +225,19 @@
private void setDefaultPhoto() {
mPhotoImageView.setImageDrawable(ContactPhotoManager.getDefaultAvatarDrawableForContact(
getResources(), /* hires =*/ false, /* defaultImageRequest =*/ null));
+ setDefaultPhotoTint();
mIsPhotoSet = false;
mValuesDelta.setFromTemplate(true);
}
+ private void setDefaultPhotoTint() {
+ final int color = mMaterialPalette == null
+ ? MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors(
+ getResources()).mPrimaryColor
+ : mMaterialPalette.mPrimaryColor;
+ mPhotoImageView.setTint(color);
+ }
+
/**
* Bind the photo at the given Uri to the UI but do not set the photo on the underlying
* {@link ValuesDelta}.
diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 258747d..f6c4952 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -98,7 +98,7 @@
protected static final int LOADER_DATA = 1;
protected static final int LOADER_GROUPS = 2;
- private static final List<String> VALID_INTENT_ACTIONS = new ArrayList() {{
+ private static final List<String> VALID_INTENT_ACTIONS = new ArrayList<String>() {{
add(Intent.ACTION_EDIT);
add(Intent.ACTION_INSERT);
add(ContactEditorBaseActivity.ACTION_EDIT);
@@ -142,6 +142,8 @@
// Join Activity
private static final String KEY_CONTACT_ID_FOR_JOIN = "contactidforjoin";
+ private static final String KEY_UPDATED_PHOTOS = "updatedPhotos";
+
protected static final int REQUEST_CODE_JOIN = 0;
protected static final int REQUEST_CODE_ACCOUNTS_CHANGED = 1;
protected static final int REQUEST_CODE_PICK_RINGTONE = 2;
@@ -165,6 +167,12 @@
public static final String INTENT_EXTRA_MATERIAL_PALETTE = "material_palette";
/**
+ * Intent key to pass a Bundle of raw contact IDs to photos URIs between the compact editor
+ * and the fully expanded one.
+ */
+ public static final String INTENT_EXTRA_UPDATED_PHOTOS = "updated_photos";
+
+ /**
* Intent extra to specify a {@link ContactEditor.SaveMode}.
*/
public static final String SAVE_MODE_EXTRA_KEY = "saveMode";
@@ -342,9 +350,11 @@
// Join Activity
protected long mContactIdForJoin;
+ // Full resolution photo URIs
+ protected Bundle mUpdatedPhotos = new Bundle();
+
//
- // Editor state for {@link ContactEditorView}.
- // (Not saved/restored on rotates)
+ // Not saved/restored on rotates
//
// Used to pre-populate the editor with a display name when a user edits a read-only contact.
@@ -353,6 +363,10 @@
// Whether the name editor should receive focus after being bound
protected boolean mRequestFocus;
+ // Whether to show a Toast message after saves have completed.
+ // Does not affect successful toasts shown after joins, which are never displayed.
+ protected boolean mShowToastAfterSave = true;
+
/**
* The contact data loader listener.
*/
@@ -474,6 +488,9 @@
// Join Activity
mContactIdForJoin = savedState.getLong(KEY_CONTACT_ID_FOR_JOIN);
+
+ // Full resolution photo URIs
+ mUpdatedPhotos = savedState.getParcelable(KEY_UPDATED_PHOTOS);
}
// mState can still be null because it may not have have finished loading before
@@ -594,6 +611,9 @@
// Join Activity
outState.putLong(KEY_CONTACT_ID_FOR_JOIN, mContactIdForJoin);
+ // Full resolution photo URIs
+ outState.putParcelable(KEY_UPDATED_PHOTOS, mUpdatedPhotos);
+
super.onSaveInstanceState(outState);
}
@@ -708,8 +728,6 @@
final MenuItem sendToVoiceMailMenu = menu.findItem(R.id.menu_send_to_voicemail);
final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone);
final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
- deleteMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- deleteMenu.setIcon(R.drawable.ic_delete_white_24dp);
// Set visibility of menus
doneMenu.setVisible(false);
@@ -879,16 +897,16 @@
mStatus = Status.SAVING;
- // Don't abort if there are no changes and we are returning to the compact editor --
- // the user may have simply expanded the editor then hit back
- if (!hasPendingChanges() && saveMode != SaveMode.COMPACT) {
+ if (!hasPendingChanges()) {
if (mLookupUri == null && saveMode == SaveMode.RELOAD) {
// We don't have anything to save and there isn't even an existing contact yet.
// Nothing to do, simply go back to editing mode
mStatus = Status.EDITING;
return true;
}
- onSaveCompleted(false, saveMode, /* saveSucceeded =*/ mLookupUri != null, mLookupUri);
+ onSaveCompleted(/* hadChanges =*/ false, saveMode,
+ /* saveSucceeded =*/ mLookupUri != null, mLookupUri,
+ /* updatedPhotos =*/ null);
return true;
}
@@ -902,7 +920,7 @@
// If we're coming back from the fully expanded editor and this is an insert, just
// pass any values entered by the user back to the compact editor without doing a save
final Intent resultIntent = EditorIntents.createCompactInsertContactIntent(
- mState, getDisplayName());
+ mState, getDisplayName(), mUpdatedPhotos);
mListener.onSaveFinished(resultIntent);
return true;
}
@@ -1111,10 +1129,6 @@
RawContactDelta oldState, AccountType oldAccountType) {
mStatus = Status.EDITING;
mState.add(createNewRawContactDelta(account, accountType, oldState, oldAccountType));
- // We bind field values that may be present on inserts since the caller may want certain
- // fields pre-populated or we may be returning to the compact editor from the fully
- // expanded one.
- setIntentExtras(mIntentExtras);
mRequestFocus = true;
mNewContactDataReady = true;
bindEditors();
@@ -1277,8 +1291,10 @@
mIntentExtras.getBoolean(INTENT_EXTRA_NEW_LOCAL_PROFILE);
mDisableDeleteMenuOption =
mIntentExtras.getBoolean(INTENT_EXTRA_DISABLE_DELETE_MENU_OPTION);
- mMaterialPalette =
- mIntentExtras.getParcelable(INTENT_EXTRA_MATERIAL_PALETTE);
+ mMaterialPalette = mIntentExtras.getParcelable(INTENT_EXTRA_MATERIAL_PALETTE);
+ if (mIntentExtras.containsKey(INTENT_EXTRA_UPDATED_PHOTOS)) {
+ mUpdatedPhotos = mIntentExtras.getParcelable(INTENT_EXTRA_UPDATED_PHOTOS);
+ }
}
}
@@ -1301,15 +1317,15 @@
@Override
public void onJoinCompleted(Uri uri) {
- onSaveCompleted(false, SaveMode.RELOAD, uri != null, uri);
+ onSaveCompleted(false, SaveMode.RELOAD, uri != null, uri, /* updatedPhotos =*/ null);
}
@Override
public void onSaveCompleted(boolean hadChanges, int saveMode, boolean saveSucceeded,
- Uri contactLookupUri) {
+ Uri contactLookupUri, Bundle updatedPhotos) {
if (hadChanges) {
if (saveSucceeded) {
- if (saveMode != SaveMode.JOIN && showToastAfterSave()) {
+ if (saveMode != SaveMode.JOIN && mShowToastAfterSave) {
Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT).show();
}
} else {
@@ -1320,26 +1336,28 @@
case SaveMode.CLOSE:
case SaveMode.COMPACT:
final Intent resultIntent;
- if (saveSucceeded && contactLookupUri != null) {
+ if (!saveSucceeded || contactLookupUri == null) {
+ resultIntent = saveMode == SaveMode.COMPACT
+ ? EditorIntents.createCompactInsertContactIntent(
+ mState, getDisplayName(), updatedPhotos)
+ : null;
+ } else {
final Uri lookupUri = maybeConvertToLegacyLookupUri(
mContext, contactLookupUri, mLookupUri);
if (saveMode == SaveMode.CLOSE) {
resultIntent = ImplicitIntentsUtil.composeQuickContactIntent(lookupUri,
QuickContactActivity.MODE_FULLY_EXPANDED);
} else if (saveMode == SaveMode.COMPACT) {
- if (isInsert(getActivity().getIntent())) {
- resultIntent = EditorIntents.createCompactInsertContactIntent(
- mState, getDisplayName());
- } else {
- resultIntent = EditorIntents.createCompactEditContactIntent(
- lookupUri, getMaterialPalette());
- }
+ resultIntent = isInsert(getActivity().getIntent())
+ ? EditorIntents.createCompactInsertContactIntent(
+ mState, getDisplayName(), updatedPhotos)
+ : EditorIntents.createCompactEditContactIntent(
+ lookupUri, getMaterialPalette(), updatedPhotos);
} else {
resultIntent = null;
}
- } else {
- resultIntent = null;
}
+
// It is already saved, so prevent that it is saved again
mStatus = Status.CLOSING;
if (mListener != null) mListener.onSaveFinished(resultIntent);
@@ -1375,14 +1393,6 @@
}
/**
- * Whether to show a Toast message after saves have completed.
- * Does not affect successful toasts shown after joins, which are never displayed.
- */
- protected boolean showToastAfterSave() {
- return true;
- }
-
- /**
* Shows a list of aggregates that can be joined into the currently viewed aggregate.
*
* @param contactLookupUri the fresh URI for the currently edited contact (after saving it)
@@ -1398,22 +1408,6 @@
startActivityForResult(intent, REQUEST_CODE_JOIN);
}
- /**
- * Returns true if there is at least one writable raw contact in the current contact.
- */
- private boolean isContactWritable() {
- final AccountTypeManager accountTypes = AccountTypeManager.getInstance(mContext);
- int size = mState.size();
- for (int i = 0; i < size; i++) {
- RawContactDelta entity = mState.get(i);
- final AccountType type = entity.getAccountType(accountTypes);
- if (type.areContactsWritable()) {
- return true;
- }
- }
- return false;
- }
-
//
// Aggregation PopupWindow
//
@@ -1564,6 +1558,25 @@
abstract protected void joinAggregate(long contactId);
//
+ // Photos
+ //
+
+ /**
+ * Removes the full resolution photo URIs for new raw contacts (identified by negative raw
+ * contact IDs) from the member Bundle of updated photos.
+ */
+ protected void removeNewRawContactPhotos() {
+ for (String key : mUpdatedPhotos.keySet()) {
+ try {
+ if (Integer.parseInt(key) < 0) {
+ mUpdatedPhotos.remove(key);
+ }
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ }
+
+ //
// Utility methods
//
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 791e20d..5b3c7fa 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -22,8 +22,6 @@
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.text.TextUtils;
import android.util.Log;
@@ -46,7 +44,6 @@
import com.android.contacts.common.model.account.AccountWithDataSet;
import com.android.contacts.common.util.AccountsListAdapter;
import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.common.util.MaterialColorMapUtils;
import com.android.contacts.detail.PhotoSelectionHandler;
import com.android.contacts.editor.Editor.EditorListener;
import com.android.contacts.util.ContactPhotoUtils;
@@ -67,7 +64,6 @@
private static final String KEY_RAW_CONTACT_ID_REQUESTING_PHOTO = "photorequester";
private static final String KEY_CURRENT_PHOTO_URI = "currentphotouri";
- private static final String KEY_UPDATED_PHOTOS = "updatedPhotos";
// Used to store which raw contact editors have been expanded. Keyed on raw contact ids.
private HashMap<Long, Boolean> mExpandedEditors = new HashMap<Long, Boolean>();
@@ -88,7 +84,6 @@
*/
private PhotoHandler mCurrentPhotoHandler;
private Uri mCurrentPhotoUri;
- private Bundle mUpdatedPhotos = new Bundle();
public ContactEditorFragment() {
}
@@ -114,7 +109,6 @@
mRawContactIdRequestingPhoto = savedState.getLong(
KEY_RAW_CONTACT_ID_REQUESTING_PHOTO);
mCurrentPhotoUri = savedState.getParcelable(KEY_CURRENT_PHOTO_URI);
- mUpdatedPhotos = savedState.getParcelable(KEY_UPDATED_PHOTOS);
}
}
@@ -532,6 +526,10 @@
@Override
protected boolean doSaveAction(int saveMode) {
// Save contact and reload the compact editor after saving.
+ // Note, the full resolution photos Bundle must be passed to the ContactSaveService
+ // and then passed along in the result Intent in order for the compact editor to
+ // receive it, instead of mUpdatedPhotos being accessed directly in onSaveCompleted,
+ // because we clear mUpdatedPhotos after starting the save service below.
Intent intent = ContactSaveService.createSaveContactIntent(mContext, mState,
SAVE_MODE_EXTRA_KEY, saveMode, isEditingUserProfile(),
((Activity) mContext).getClass(), ContactEditorActivity.ACTION_SAVE_COMPLETED,
@@ -549,7 +547,6 @@
outState.putSerializable(KEY_EXPANDED_EDITORS, mExpandedEditors);
outState.putLong(KEY_RAW_CONTACT_ID_REQUESTING_PHOTO, mRawContactIdRequestingPhoto);
outState.putParcelable(KEY_CURRENT_PHOTO_URI, mCurrentPhotoUri);
- outState.putParcelable(KEY_UPDATED_PHOTOS, mUpdatedPhotos);
super.onSaveInstanceState(outState);
}
@@ -604,6 +601,12 @@
Log.w(TAG, "The contact that requested the photo is no longer present.");
}
+ // For inserts where the raw contact ID is a negative number, we must clear any previously
+ // saved full resolution photos under negative raw contact IDs so that the compact editor
+ // will use the newly selected photo, instead of an old one.
+ if (isInsert(getActivity().getIntent()) && rawContact < 0) {
+ removeNewRawContactPhotos();
+ }
mUpdatedPhotos.putParcelable(String.valueOf(rawContact), photoUri);
}
diff --git a/src/com/android/contacts/editor/EditorIntents.java b/src/com/android/contacts/editor/EditorIntents.java
index 39c14e5..3fb2145 100644
--- a/src/com/android/contacts/editor/EditorIntents.java
+++ b/src/com/android/contacts/editor/EditorIntents.java
@@ -24,6 +24,7 @@
import android.content.ContentValues;
import android.content.Intent;
import android.net.Uri;
+import android.os.Bundle;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.text.TextUtils;
@@ -43,9 +44,10 @@
* existing contact.
*/
public static Intent createCompactEditContactIntent(Uri contactLookupUri,
- MaterialPalette materialPalette) {
+ MaterialPalette materialPalette, Bundle updatedPhotos) {
final Intent intent = new Intent(Intent.ACTION_EDIT, contactLookupUri);
putMaterialPalette(intent, materialPalette);
+ putUpdatedPhotos(intent, updatedPhotos);
return intent;
}
@@ -54,7 +56,7 @@
*/
public static Intent createCompactInsertContactIntent() {
return createCompactInsertContactIntent(/* rawContactDeltaList =*/ null,
- /* displayName =*/ null);
+ /* displayName =*/ null, /* updatedPhotos =*/ null);
}
/**
@@ -62,11 +64,12 @@
* the field values specified by rawContactDeltaList pre-populate in the form.
*/
public static Intent createCompactInsertContactIntent(RawContactDeltaList rawContactDeltaList,
- String displayName) {
+ String displayName, Bundle updatedPhotos) {
final Intent intent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
if (rawContactDeltaList != null || displayName != null) {
putRawContactDeltaValues(intent, rawContactDeltaList, displayName);
}
+ putUpdatedPhotos(intent, updatedPhotos);
return intent;
}
@@ -105,11 +108,12 @@
* existing contact.
*/
public static Intent createInsertContactIntent(RawContactDeltaList rawContactDeltaList,
- String displayName) {
+ String displayName, Bundle updatedPhotos) {
final Intent intent = new Intent(ContactEditorBaseActivity.ACTION_INSERT,
Contacts.CONTENT_URI);
addContactIntentFlags(intent);
putRawContactDeltaValues(intent, rawContactDeltaList, displayName);
+ putUpdatedPhotos(intent, updatedPhotos);
return intent;
}
@@ -126,6 +130,12 @@
}
}
+ private static void putUpdatedPhotos(Intent intent, Bundle updatedPhotos) {
+ if (updatedPhotos != null && !updatedPhotos.isEmpty()) {
+ intent.putExtra(ContactEditorBaseFragment.INTENT_EXTRA_UPDATED_PHOTOS, updatedPhotos);
+ }
+ }
+
private static void putRawContactDeltaValues(Intent intent,
RawContactDeltaList rawContactDeltaList, String displayName) {
// Pass on all the data that has been entered so far
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 56c81a0..adf2a73 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -55,7 +55,6 @@
* section header and a trigger for adding new {@link Data} rows.
*/
public class KindSectionView extends LinearLayout implements EditorListener {
- private static final String TAG = "KindSectionView";
private ViewGroup mEditors;
private ImageView mIcon;
diff --git a/src/com/android/contacts/editor/PhoneticNameEditorView.java b/src/com/android/contacts/editor/PhoneticNameEditorView.java
index e645687..420575c 100644
--- a/src/com/android/contacts/editor/PhoneticNameEditorView.java
+++ b/src/com/android/contacts/editor/PhoneticNameEditorView.java
@@ -151,12 +151,4 @@
return !TextUtils.isEmpty(family) || !TextUtils.isEmpty(middle)
|| !TextUtils.isEmpty(given);
}
-
- /** {@inheritDoc} */
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
- // Remove padding below this view.
- setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
- }
}
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index 5f27922..40f4f82 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -53,7 +53,6 @@
private ContactPhotoManager mContactPhotoManager;
private boolean mHasSetPhoto = false;
- private boolean mReadOnly;
public PhotoEditorView(Context context) {
super(context);
@@ -116,7 +115,6 @@
public void setValues(DataKind kind, ValuesDelta values, RawContactDelta state, boolean readOnly,
ViewIdGenerator vig) {
mEntry = values;
- mReadOnly = readOnly;
setId(vig.getId(state, kind, values, 0));
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index f9dd0c9..0f98f53 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -18,7 +18,6 @@
import android.content.ContentValues;
import android.content.Context;
-import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
@@ -288,12 +287,4 @@
return 0;
}
}
-
- /** {@inheritDoc} */
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
- // Remove padding below this view.
- setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
- }
}
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index b10963b..b05cbab 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -32,6 +32,7 @@
import android.os.Bundle;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Contacts.Entity;
+import android.text.TextUtils;
import android.util.Log;
import com.android.contacts.ContactSaveService;
@@ -254,6 +255,11 @@
readOnlyRawContacts.add(rawContactId);
}
}
+ if (TextUtils.isEmpty(lookupKey)) {
+ Log.e(TAG, "Failed to find contact lookup key");
+ getActivity().finish();
+ return;
+ }
int readOnlyCount = readOnlyRawContacts.size();
int writableCount = writableRawContacts.size();
diff --git a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
index a76a4a1..9822b79 100644
--- a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
@@ -64,10 +64,9 @@
// Pass the cursor down. Don't worry, it isn't used.
itemView = newView(getContext(), 0, getCursor(0), 0, parent);
} else {
- itemView = (ContactListItemView ) convertView;
+ itemView = (ContactListItemView) convertView;
}
- itemView.setDrawableResource(R.drawable.search_shortcut_background,
- R.drawable.ic_search_add_contact);
+ itemView.setDrawableResource(R.drawable.ic_search_add_contact);
itemView.setDisplayName(getContext().getResources().getString(
R.string.header_entry_contact_list_adapter_header_title));
return itemView;
diff --git a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
index 1571b0a..c4969cc 100644
--- a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
+++ b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
@@ -1,15 +1,26 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
package com.android.contacts.quickcontact;
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.common.editor.SelectAccountDialogFragment;
-import com.android.contacts.common.model.AccountTypeManager;
import com.android.contacts.common.model.Contact;
import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.quickcontact.QuickContactActivity.SelectAccountDialogFragmentListener;
-import android.app.FragmentManager;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -17,7 +28,6 @@
import android.widget.Toast;
import java.util.ArrayList;
-import java.util.List;
/**
* Utility class to support adding directory contacts.
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 9633716..154968d 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2202,8 +2202,10 @@
private Intent getEditContactIntent() {
return EditorIntents.createCompactEditContactIntent(
- mContactData.getLookupUri(), mHasComputedThemeColor
- ? new MaterialPalette(mColorFilterColor, mStatusBarColor) : null);
+ mContactData.getLookupUri(),
+ mHasComputedThemeColor
+ ? new MaterialPalette(mColorFilterColor, mStatusBarColor) : null,
+ /* updatedPhotos =*/ null);
}
private void editContact() {
diff --git a/tests/Android.mk b/tests/Android.mk
index 241ff5e..880f62f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,10 +6,12 @@
LOCAL_CERTIFICATE := shared
LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.contacts.common.test
+
+src_dirs := src \
+ ../../ContactsCommon/TestCommon/src
# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_PACKAGE_NAME := ContactsTests
