Fix long logging tags am: ffb419e08d
am: b7fd2f6165
Change-Id: I12a81a0cf0861c1429086c674608e3bc70a55c8d
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58209ae..0708afb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10710"
- android:versionName="1.7.10">
+ android:versionCode="10720"
+ android:versionName="1.7.20">
<uses-sdk
android:minSdkVersion="21"
diff --git a/res/layout/expanding_entry_card_item.xml b/res/layout/expanding_entry_card_item.xml
index 99f9174..dbbeee5 100644
--- a/res/layout/expanding_entry_card_item.xml
+++ b/res/layout/expanding_entry_card_item.xml
@@ -88,8 +88,8 @@
<ImageView
android:id="@+id/third_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/default_clickable_icon_size"
+ android:layout_height="@dimen/default_clickable_icon_size"
android:layout_alignParentTop="true"
android:layout_toStartOf="@+id/icon_alternate"
android:layout_alignWithParentIfMissing="true"
@@ -102,8 +102,8 @@
<ImageView
android:id="@+id/icon_alternate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/default_clickable_icon_size"
+ android:layout_height="@dimen/default_clickable_icon_size"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:visibility="gone"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f814324..48ac24b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Kon nie invoer nie"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kon nie kontakte vanaf SIM-kaart invoer nie"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Voer tans SIM in"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Kennisgewings"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f712d43..0a29b4f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ማስመጣት አልተሳካም"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ከ SIM ካርድ ዕውቂያዎች ማስመጣት አልተቻለም"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ሲም በማምጣት ላይ"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ማሳወቂያዎች"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 474c2c3..e164586 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -249,7 +249,7 @@
<string name="editor_change_photo_content_description" msgid="820879708069864340">"تغيير صورة جهة الاتصال"</string>
<string name="editor_add_photo_content_description" msgid="4194479313465418120">"إضافة صورة جهة الاتصال"</string>
<string name="editor_contact_photo_content_description" msgid="8571975622926162369">"صورة جهة الاتصال"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"أخفق فتح المحرر."</string>
+ <string name="editor_failed_to_load" msgid="1623639078580475818">"تعذّر فتح المحرر."</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"الحفظ في"</string>
<string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"معلومات جهة الاتصال من <xliff:g id="ACCOUNT">%s</xliff:g> غير قابلة للتعديل"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ربط جهات الاتصال"</string>
@@ -553,9 +553,8 @@
<string name="single_sim_display_label" msgid="6985770499439371497">"شريحة SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"عرض المزيد"</string>
<string name="importing_sim_finished_title" msgid="5196369441294050721">"انتهى استيراد شريحة SIM"</string>
- <string name="importing_sim_failed_title" msgid="39706901030537985">"أخفق الاستيراد"</string>
+ <string name="importing_sim_failed_title" msgid="39706901030537985">"تعذّر الاستيراد"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"تعذر استيراد جهات الاتصال من شريحة SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"استيراد SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"الإشعارات"</string>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 72c4809..4482a9f 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"İmport alınmadı"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktları SIM kartdan import etmək olmadı"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM import edilir"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirişlər"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d4d812c..7443661 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz nije uspeo"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Uvoz kontakata sa SIM kartice nije uspeo"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvozi se sa SIM-a"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obaveštenja"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c4f6730..fc70b1f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Не ўдалося імпартаваць"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не ўдалося імпартаваць кантакты з SIM-карты"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпартаванне SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Апавяшчэнні"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 09231c7..e118077 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Импортирането не бе успешно"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактите не можаха да се импортират от SIM картата"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импортира се от SIM картата"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известия"</string>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 60e3d9b..f6aaf59 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"আমদানি ব্যর্থ হয়েছে"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"সিম কার্ড থেকে পরিচিতিগুলি আমদানি করা গেল না"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"সিম আমদানি করা হচ্ছে"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"বিজ্ঞপ্তি"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ea786b7..ef4cdbd 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz nije uspio"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nije moguće uvesti kontakte sa SIM kartice"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz sa SIM kartice"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavještenja"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c4cf495..43aa546 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"La importació ha fallat"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No s\'han pogut importar els contactes de la targeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"S\'estan important els contactes de la SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacions"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 96d3875..b15320a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import se nezdařil"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakty ze SIM karty se nepodařilo importovat"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importování ze SIM karty"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Oznámení"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ddbe815..ec1b4ee 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importen mislykkedes"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktpersonerne kunne ikke importeres fra SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kortet importeres"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Underretninger"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 73b877a..edfea3b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Fehler beim Importieren"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte konnten nicht von SIM-Karte importiert werden"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM wird importiert"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Benachrichtigungen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 945402e..2f8e909 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Αποτυχία εισαγωγής"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Δεν ήταν δυνατή η εισαγωγή επαφών από την κάρτα SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Εισαγωγή από SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ειδοποιήσεις"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c4c7131..d31ce21 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import failed"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c4c7131..d31ce21 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import failed"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c4c7131..d31ce21 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import failed"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1be103d..38e57f8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Error al importar"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No se pudieron importar los contactos de la tarjeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando la tarjeta SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e047fab..57745e3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"No se ha podido realizar la importación"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No se han podido importar los contactos de la tarjeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se está importando la tarjeta SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 744e24b..3346bd6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importimine ebaõnnestus"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte ei õnnestunud SIM-kaardilt importida"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kaardi importimine"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Märguanded"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 7776242..e9d9ab9 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Ezin izan da inportatu"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Ezin izan dira inportatu SIM txarteleko kontaktuak"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM txartela inportatzen"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Jakinarazpenak"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 97c0d7a..12a153f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"وارد نشد"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"مخاطبین از سیم کارت وارد نشدند"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"وارد کردن سیم کارت"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"اعلانها"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f052068..a2f4a5f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Tuonti epäonnistui."</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Yhteystietojen tuominen SIM-kortilta epäonnistui."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Tuodaan SIM-kortin yhteystietoja"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ilmoitukset"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b5ca8bd..6bd2931 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Échec de l\'importation"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer des contacts à partir de la carte SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation des contacts SIM en cours…"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Avis"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0c33b80..9926d89 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Échec lors de l\'importation"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer les contacts depuis la carte SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation depuis la carte SIM..."</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1fa3936..6cd2b61 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Produciuse un erro na importación"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Non se puideron importar os contactos da tarxeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacións"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1cc4617..70ee150 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"આયાત કરવું નિષ્ફળ થયું"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM કાર્ડમાંથી સંપર્કો આયાત કરી શક્યાં નથી"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM આયાત કરી રહ્યાં છે"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"સૂચનાઓ"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6f4788f..4f4f7e1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"आयात करना विफल रहा"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्ड से संपर्क आयात नहीं किए जा सके"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM को आयात किया जा रहा है"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"नोटिफ़िकेशन"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 021b4aa..8c6fc80 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz nije uspio"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Uvoz kontakata sa SIM kartice nije moguć"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz SIM kontakata"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavijesti"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 35f0e44..6ac484d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Sikertelen importálás"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nem sikerült importálni a névjegyeket a SIM-kártyáról"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kártya importálása folyamatban"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Értesítések"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e8d2033..c5587cc 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Ներմուծման սխալ"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM քարտի ներմուծում"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ծանուցումներ"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 09849f0..105d113 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Impor gagal"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimpor kontak dari kartu SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimpor SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifikasi"</string>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 45c92cf..c94e07c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Innflutningur mistókst"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Gat ekki flutt inn tengiliði af SIM-korti"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Flytur inn SIM-kort"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Tilkynningar"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6a767f1..d144f98 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importazione non riuscita"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossibile importare i contatti dalla scheda SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importazione della SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifiche"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 899019e..03d9350 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"הייבוא נכשל"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"הייבוא מכרטיס ה-SIM מתבצע"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"הודעות"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3e56e34..74c7048 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"インポートに失敗しました"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM カードの連絡先をインポートできませんでした"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM からインポートしています"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 91a6dc5..4c8b349 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"იმპორტი ვერ შესრულდა"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ბარათიდან კონტაქტების იმპორტი ვერ შესრულდა"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"მიმდინარეობს SIM-ის იმპორტი"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"შეტყობინებები"</string>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 79c43e7..b4e66b3 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Импорттау мүмкін болмады"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактілерді SIM картасынан импорттау мүмкін болмады"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM картасы импортталуда"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Хабарландырулар"</string>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index fc34ed8..41b984d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ការនាំចូលមិនបានសម្រេច"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"មិនអាចនាំចូលទំនាក់ទំនងពីស៊ីមកាតបានទេ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"កំពុងនាំចូលទំនាក់ទំនងពី SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ការជូនដំណឹង"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 0858ff9..1ab7b76 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ಆಮದು ವಿಫಲವಾಗಿದೆ"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ಸಿಮ್ ಕಾರ್ಡ್ನಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ಸಿಮ್ ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ಅಧಿಸೂಚನೆಗಳು"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 74c7fb0..347aac7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"가져오기 실패"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM 카드에서 연락처를 가져올 수 없습니다."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM 가져오는 중"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"알림"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a75c84b..2fe27b3 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Импорттолбой калды"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM-картадан байланыштар импорттолбой койду"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-картадан өткөрүлүп алынууда"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Эскертмелер"</string>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1962bd8..bb09b21 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ນຳເຂົ້າບໍ່ສຳເລັດ"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ບໍ່ສາມາດນຳເຂົ້າລາຍຊື່ຜູ້ຕິດຕໍ່ຈາກຊິມກາດໄດ້"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ກຳລັງນຳເຂົ້າຈາກ SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ການແຈ້ງເຕືອນ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 37087ab..aee61b1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Nepavyko importuoti"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepavyko importuoti kontaktų iš SIM kortelės"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuojami SIM kortelės kontaktai"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pranešimai"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 77ff461..ee82810 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importēšana neizdevās"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nevarēja importēt kontaktpersonas no SIM kartes."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Notiek SIM kartes importēšana"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Paziņojumi"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2c11e2e..0f1cc06 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -520,7 +520,7 @@
<string name="account_sync_off" msgid="7646143254066243924">"Автоматското синхронизирање е исклучено. Допрете за да го вклучите."</string>
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Да се вклучи автоматско синхронизирање?"</string>
<string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Промените што ги правите на сите апликации и сметки, не само на „Контакти на Google“, ќе се ажурираат и на интернет и на вашите уреди."</string>
- <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Вклучете"</string>
+ <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Вклучи"</string>
<string name="connection_error_message" msgid="7046408921529247089">"Нема мрежа"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Прикажи повеќе"</string>
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Увезувањето не успеа"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не можеше да се увезат контакти од SIM-картичката"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Се увезува SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известувања"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 19f8418..1aa30a6 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ഇമ്പോർട്ടുചെയ്യൽ പരാജയപ്പെട്ടു"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"സിം കാർഡിൽ നിന്ന് കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"അറിയിപ്പുകൾ"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index c5e6c19..ef1fee9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Импортолж чадсангүй"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM картнаас харилцагчдыг импортолж чадсангүй"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-г импорт хийж байна"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Мэдэгдэл"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8ea3a60..087ec81 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -284,7 +284,7 @@
<string name="sms_mobile" msgid="5200107250451030769">"मोबाईलवर मजकूर पाठवा"</string>
<string name="sms_work" msgid="2269624156655267740">"कार्यस्थानी मजकूर पाठवा"</string>
<string name="sms_fax_work" msgid="8028189067816907075">"कार्य फॅक्सवर मजकूर पाठवा"</string>
- <string name="sms_fax_home" msgid="9204042076306809634">"निवासस्थान फॅक्सवर मजकूर पाठवा"</string>
+ <string name="sms_fax_home" msgid="9204042076306809634">"घर फॅक्सवर मजकूर पाठवा"</string>
<string name="sms_pager" msgid="7730404569637015192">"पेजरवर मजकूर पाठवा"</string>
<string name="sms_other" msgid="806127844607642331">"मजकूर"</string>
<string name="sms_callback" msgid="5004824430094288752">"कॉलबॅक वर मजकूर पाठवा"</string>
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"आयात अयशस्वी झाले"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"सिम कार्ड वरून संपर्क आयात करणेे शक्य झाले नाही"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करीत आहे"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचना"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0e11dd9..fa06426 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Pengimportan gagal"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimport kenalan daripada kad SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimport SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pemberitahuan"</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3d612cd..341dc1a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"တင်သွင်း၍မရပါ"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ဆင်းမ်ကဒ်မှ အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ဆင်းမ်ကဒ်ကို တင်သွင်းနေသည်"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"အကြောင်းကြားချက်များ"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7d64b4b..81233b6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importeringen mislyktes"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kunne ikke importére kontakter fra SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerer fra SIM-kortet"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Varsler"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 462832e..b7a9f91 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"आयात गर्न सकिएन"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्डबाट सम्पर्कहरू आयात गर्न सकिएन"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM आयात गरिँदै"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचनाहरू"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c97fb6e..6caa088 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importeren mislukt"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kan geen contacten importeren van de simkaart"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Sim importeren"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meldingen"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 788a6c3..78dcd95 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"ਆਯਾਤ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ਕਾਰਡ ਤੋਂ ਸੰਪਰਕ ਆਯਾਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ਸਿਮ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"ਸੂਚਨਾਵਾਂ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index da8506a..adf7a84 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Nie udało się zaimportować"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nie udało się zaimportować kontaktów z karty SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuję kontakty z karty SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Powiadomienia"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ce6ee65..d0148d8 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Falha na importação"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6f11e27..cdbcb93 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Falha ao importar"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar contactos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ce6ee65..d0148d8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Falha na importação"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9805e82..291c9a5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Nu s-a importat."</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nu s-a putut importa agenda de pe cardul SIM."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se importă cardul SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificări"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index de4dead..48aaca2 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Ошибка импорта"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не удалось импортировать контакты с SIM-карты"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импорт контактов с SIM-карты…"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Уведомления"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index bfa2bc9..9b7e7a7 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"අයාත කිරීම අසාර්ථක විය"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"සම්බන්ධතා SIM කාඩ්පතෙන් ආයාත කිරීමට නොහැකි විය"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM ආයාත කරමින්"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"දැනුම් දීම්"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 63d2bdf..4c468b6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import zlyhal"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepodarilo sa importovať kontakty zo SIM karty"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuje sa SIM karta"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Upozornenia"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6971422..eea2486 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz ni uspel"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Stikov s kartic SIM ni bilo mogoče uvoziti"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvažanje kartice SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obvestila"</string>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a7a6334..c1e37d0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Importimi dështoi"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktet nga karta SIM nuk mund të importoheshin"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Karta SIM po importohet"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Njoftime"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8ae1259..5432ef6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Увоз није успео"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Увоз контаката са SIM картице није успео"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Увози се са SIM-а"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Обавештења"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e55c7ef..6a7b7a7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Det gick inte att importera"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Det gick inte att importera kontakter från SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerar SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meddelanden"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index be804c2..232ca84 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Imeshindwa kuleta anwani"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Imeshindwa kuleta anwani kutoka kwenye SIM kadi"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Anwani zilizo kwenye SIM kadi zinaletwa"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Arifa"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 575208d..fe4817f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"இறக்க முடியவில்லை"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"சிம் கார்டிலிருந்து தொடர்புகளை இறக்க முடியவில்லை"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"சிம் கார்டை இறக்குகிறது"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"அறிவிப்புகள்"</string>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e6a98c2..4ed79cf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"దిగుమతి విఫలమైంది"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM కార్డ్ నుండి పరిచయాలను దిగుమతి చేయలేకపోయింది"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIMను దిగుమతి చేస్తోంది"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"నోటిఫికేషన్లు"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6c5a4d4..9ee6f79 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"การนำเข้าล้มเหลว"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"นำเข้ารายชื่อติดต่อจากซิมการ์ดไม่ได้"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"กำลังนำเข้าจากซิมการ์ด"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"การแจ้งเตือน"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 29ed00b..294e7da 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Nabigong i-import"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Hindi ma-import ang mga contact mula sa SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ini-import ang SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Mga Notification"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0522544..4b64456 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"İçe aktarma başarısız oldu"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM karttaki kişiler içe aktarılamadı"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM kişileri içe aktarılıyor"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirimler"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6d8e07a..5c36249 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Не вдалось імпортувати"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не вдалось імпортувати контакти із SIM-карти"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпорт SIM-карти"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Сповіщення"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d9fb02f..3dee482 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"درآمد کرنا ناکام ہو گیا"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM کارڈ سے رابطے درآمد نہیں ہو سکے"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM درآمد ہو رہی ہے"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"اطلاعات"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index df736c4..b098955 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Import qilib bo‘lmadi"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktlarni SIM kartadan import qilib bo‘lmadi."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Kontakt. SIM kartadan import qilinmoqda…"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirishnomalar"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fda87ae..ad73988 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Nhập không thành công"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Không thể nhập liên hệ từ thẻ SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Đang nhập SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Thông báo"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 369e08c..207a762 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"导入失败"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"无法导入 SIM 卡中的联系人"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在导入 SIM 卡联系人"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3e53b59..9f7779e 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"匯入失敗"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cdbb720..8b2e322 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"匯入失敗"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人資料"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡資料"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1cdc484..60fc113 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -528,6 +528,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Ukungenisa kuhlulekile"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Ayikwazanga ukungenisa oxhumana nabo kusukela ku-SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ingenisa i-SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Izaziso"</string>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e9fe2ad..c14d396 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,6 +14,8 @@
limitations under the License.
-->
<resources>
+ <!-- Size of clickable icons that are GAR-4 -->
+ <dimen name="default_clickable_icon_size">48dp</dimen>
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-port-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">64dp</dimen>
diff --git a/src/com/android/contacts/Experiments.java b/src/com/android/contacts/Experiments.java
index b53ced3..b66311d 100644
--- a/src/com/android/contacts/Experiments.java
+++ b/src/com/android/contacts/Experiments.java
@@ -39,6 +39,12 @@
"Shortcuts__dynamic_min_content_change_update_delay_millis";
/**
+ * Flags for enabling video call from quick contact.
+ */
+ public static final String QUICK_CONTACT_VIDEO_CALL =
+ "QuickContact__video_call_integration";
+
+ /**
* Flags for maximum time to show spinner for a contacts sync.
*/
public static final String PULL_TO_REFRESH_CANCEL_REFRESH_MILLIS =
diff --git a/src/com/android/contacts/model/dataitem/PhoneDataItem.java b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
index 8d6cf8e..6355157 100644
--- a/src/com/android/contacts/model/dataitem/PhoneDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
@@ -31,6 +31,11 @@
public static final String KEY_FORMATTED_PHONE_NUMBER = "formattedPhoneNumber";
+ private boolean mTachyonReachable;
+ // Stores the custom reachable data item to provide extra data to the Entry created from this
+ // PhoneDataItem.
+ private DataItem mReachableDataItem;
+
/* package */ PhoneDataItem(ContentValues values) {
super(values);
}
@@ -54,6 +59,22 @@
return getContentValues().getAsString(Phone.LABEL);
}
+ public void setTachyonReachable(boolean tachyonReachable) {
+ mTachyonReachable = tachyonReachable;
+ }
+
+ public boolean isTachyonReachable() {
+ return mTachyonReachable;
+ }
+
+ public DataItem getReachableDataItem() {
+ return mReachableDataItem;
+ }
+
+ public void setReachableDataItem(DataItem reachableDataItem) {
+ mReachableDataItem = reachableDataItem;
+ }
+
public void computeFormattedPhoneNumber(String defaultCountryIso) {
final String phoneNumber = getNumber();
if (phoneNumber != null) {
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index 49da4c8..b0f7800 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -117,6 +117,7 @@
private final int mIconResourceId;
private final int mThirdAction;
private final Bundle mThirdExtras;
+ private final boolean mShouldApplyThirdIconColor;
public Entry(int id, Drawable mainIcon, String header, String subHeader,
Drawable subHeaderIcon, String text, Drawable textIcon,
@@ -125,7 +126,7 @@
Spannable alternateContentDescription, boolean shouldApplyColor, boolean isEditable,
EntryContextMenuInfo entryContextMenuInfo, Drawable thirdIcon, Intent thirdIntent,
String thirdContentDescription, int thirdAction, Bundle thirdExtras,
- int iconResourceId) {
+ boolean shouldApplyThirdIconColor, int iconResourceId) {
mId = id;
mIcon = mainIcon;
mHeader = header;
@@ -146,6 +147,7 @@
mThirdContentDescription = thirdContentDescription;
mThirdAction = thirdAction;
mThirdExtras = thirdExtras;
+ mShouldApplyThirdIconColor = shouldApplyThirdIconColor;
mIconResourceId = iconResourceId;
}
@@ -232,6 +234,10 @@
public Bundle getThirdExtras() {
return mThirdExtras;
}
+
+ boolean shouldApplyThirdIconColor() {
+ return mShouldApplyThirdIconColor;
+ }
}
public interface ExpandingEntryCardViewListener {
@@ -607,7 +613,7 @@
alternateIcon.setColorFilter(mThemeColorFilter);
}
Drawable thirdIcon = entry.getThirdIcon();
- if (thirdIcon != null) {
+ if (thirdIcon != null && entry.shouldApplyThirdIconColor()) {
thirdIcon.mutate();
thirdIcon.setColorFilter(mThemeColorFilter);
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 014e1d5..866d3b5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -105,8 +105,11 @@
import com.android.contacts.ContactsActivity;
import com.android.contacts.ContactsUtils;
import com.android.contacts.DynamicShortcuts;
+import com.android.contacts.Experiments;
import com.android.contacts.NfcHandler;
import com.android.contacts.R;
+import com.android.contacts.ShortcutIntentBuilder;
+import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
import com.android.contacts.activities.ContactEditorActivity;
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.activities.RequestDesiredPermissionsActivity;
@@ -126,8 +129,6 @@
import com.android.contacts.interactions.SmsInteractionsLoader;
import com.android.contacts.interactions.TouchPointManager;
import com.android.contacts.lettertiles.LetterTileDrawable;
-import com.android.contacts.ShortcutIntentBuilder;
-import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
import com.android.contacts.list.UiIntentActions;
import com.android.contacts.logging.Logger;
import com.android.contacts.logging.QuickContactEvent.ActionType;
@@ -175,6 +176,7 @@
import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListener;
import com.android.contacts.widget.QuickContactImageView;
import com.android.contactsbind.HelpUtils;
+import com.android.contactsbind.experiments.Flags;
import com.google.common.collect.Lists;
@@ -246,6 +248,8 @@
@SuppressWarnings("deprecation")
private static final String LEGACY_AUTHORITY = android.provider.Contacts.AUTHORITY;
+ public static final String MIMETYPE_TACHYON =
+ "vnd.android.cursor.item/com.google.android.apps.tachyon.phone";
private static final String MIMETYPE_GPLUS_PROFILE =
"vnd.android.cursor.item/vnd.googleplus.profile";
private static final String GPLUS_PROFILE_DATA_5_VIEW_PROFILE = "view";
@@ -1328,6 +1332,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
/* iconResourceId = */ 0);
List<Entry> phoneticList = new ArrayList<>();
phoneticList.add(phoneticEntry);
@@ -1390,6 +1395,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
R.drawable.quantum_ic_phone_vd_theme_24);
final List<List<Entry>> promptEntries = new ArrayList<>();
@@ -1409,6 +1415,7 @@
/* EntryContextMenuInfo = */ null, /* thirdIcon = */ null,
/* thirdIntent = */ null, /* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE, /* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
R.drawable.quantum_ic_email_vd_theme_24);
promptEntries.add(new ArrayList<Entry>(1));
@@ -1443,7 +1450,6 @@
final Map<String, List<DataItem>> dataItemsMap = new HashMap<>();
- final ResolveCache cache = ResolveCache.getInstance(this);
for (RawContact rawContact : data.getRawContacts()) {
for (DataItem dataItem : rawContact.getDataItems()) {
dataItem.setRawContactId(rawContact.getId());
@@ -1472,6 +1478,7 @@
}
}
Trace.endSection();
+ bindReachability(dataItemsMap);
Trace.beginSection("sort within mimetypes");
/*
@@ -1529,6 +1536,28 @@
}
/**
+ * Bind the custom data items to each {@link PhoneDataItem} that is Tachyon reachable, the data
+ * will be needed when creating the {@link Entry} for the {@link PhoneDataItem}.
+ */
+ private void bindReachability(Map<String, List<DataItem>> dataItemsMap) {
+ final List<DataItem> phoneItems = dataItemsMap.get(Phone.CONTENT_ITEM_TYPE);
+ final List<DataItem> tachyonItems = dataItemsMap.get(MIMETYPE_TACHYON);
+ if (phoneItems != null && tachyonItems != null) {
+ for (DataItem phone : phoneItems) {
+ if (phone instanceof PhoneDataItem && ((PhoneDataItem) phone).getNumber() != null) {
+ for (DataItem tachyonItem : tachyonItems) {
+ if (((PhoneDataItem) phone).getNumber().equals(
+ tachyonItem.getContentValues().getAsString(Data.DATA1))) {
+ ((PhoneDataItem) phone).setTachyonReachable(true);
+ ((PhoneDataItem) phone).setReachableDataItem(tachyonItem);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
* Class used to hold the About card and Contact cards' data model that gets generated
* on a background thread. All data is from CP2.
*/
@@ -1574,6 +1603,7 @@
Spannable smsContentDescription = null;
Intent intent = null;
boolean shouldApplyColor = true;
+ boolean shouldApplyThirdIconColor = true;
Drawable alternateIcon = null;
Intent alternateIntent = null;
StringBuilder alternateContentDescription = new StringBuilder();
@@ -1746,6 +1776,9 @@
boolean isPresenceEnabled =
(videoCapability & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
boolean isVideoEnabled = (videoCapability & CallUtil.VIDEO_CALLING_ENABLED) != 0;
+ // Check to ensure carrier presence indicates the number supports video calling.
+ int carrierPresence = dataItem.getCarrierPresence();
+ boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
if (CallUtil.isCallWithSubjectSupported(context)) {
thirdIcon = res.getDrawable(R.drawable.quantum_ic_perm_phone_msg_vd_theme_24);
@@ -1769,20 +1802,23 @@
phone.getFormattedPhoneNumber());
thirdExtras.putString(CallSubjectDialog.ARG_NUMBER_LABEL,
phoneLabel);
- } else if (isVideoEnabled) {
- // Check to ensure carrier presence indicates the number supports video calling.
- int carrierPresence = dataItem.getCarrierPresence();
- boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
-
- if ((isPresenceEnabled && isPresent) || !isPresenceEnabled) {
- thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
- thirdAction = Entry.ACTION_INTENT;
- thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
- CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
- thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
- thirdContentDescription =
- res.getString(R.string.description_video_call);
- }
+ } else if (isVideoEnabled && (!isPresenceEnabled || isPresent)) {
+ thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+ thirdAction = Entry.ACTION_INTENT;
+ thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
+ CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
+ thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
+ thirdContentDescription =
+ res.getString(R.string.description_video_call);
+ } else if (Flags.getInstance().getBoolean(Experiments.QUICK_CONTACT_VIDEO_CALL)
+ && ((PhoneDataItem) dataItem).isTachyonReachable()) {
+ thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+ thirdAction = Entry.ACTION_INTENT;
+ thirdIntent = new Intent("com.google.android.apps.tachyon.action.CALL");
+ thirdIntent.setData(
+ Uri.fromParts(PhoneAccount.SCHEME_TEL, phone.getNumber(), null));
+ thirdContentDescription = ((PhoneDataItem) dataItem).getReachableDataItem()
+ .getContentValues().getAsString(Data.DATA2);
}
}
} else if (dataItem instanceof EmailDataItem) {
@@ -1869,6 +1905,10 @@
aboutCardName.value = res.getString(R.string.about_card_title);
}
}
+ } else if (Flags.getInstance().getBoolean(Experiments.QUICK_CONTACT_VIDEO_CALL)
+ && MIMETYPE_TACHYON.equals(dataItem.getMimeType())) {
+ // Skip these actions. They will be placed by the phone number.
+ return null;
} else {
// Custom DataItem
header = dataItem.buildDataStringForDisplay(context, kind);
@@ -1881,7 +1921,6 @@
if (intent != null) {
final String mimetype = intent.getType();
-
// Build advanced entry for known 3p types. Otherwise default to ResolveCache icon.
if (MIMETYPE_HANGOUTS.equals(mimetype)) {
// If a secondDataItem is available, use it to build an entry with
@@ -1963,7 +2002,7 @@
: smsContentDescription,
shouldApplyColor, isEditable,
entryContextMenuInfo, thirdIcon, thirdIntent, thirdContentDescription, thirdAction,
- thirdExtras, iconResourceId);
+ thirdExtras, shouldApplyThirdIconColor, iconResourceId);
}
private List<Entry> dataItemsToEntries(List<DataItem> dataItems,
@@ -2264,6 +2303,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdActionExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
interaction.getIconResourceId()));
}
return entries;
@@ -2496,7 +2536,9 @@
/* isEditable = */ false, /* EntryContextMenuInfo = */ null,
/* thirdIcon = */ null, /* thirdIntent = */ null,
/* thirdContentDescription = */ null, /* thirdAction = */ Entry.ACTION_NONE,
- /* thirdExtras = */ null, R.drawable.quantum_ic_history_vd_theme_24);
+ /* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
+ R.drawable.quantum_ic_history_vd_theme_24);
final List<List<Entry>> permissionExplanationEntries = new ArrayList<>();
permissionExplanationEntries.add(new ArrayList<Entry>());