Merge "Fixed to Added the function to add the Phonetic name into Phonetic field automaticaly."
diff --git a/Android.mk b/Android.mk
index e629e54..57d521e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,9 +46,7 @@
android-support-v4 \
com.android.vcard \
guava \
- libphonenumber \
- legacy-android-test \
- junit
+ libphonenumber
LOCAL_PACKAGE_NAME := Contacts
LOCAL_CERTIFICATE := shared
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58209ae..93b9a70 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="10721"
+ android:versionName="1.7.21">
<uses-sdk
android:minSdkVersion="21"
diff --git a/proguard.flags b/proguard.flags
index 75fbfd7..07ec5d2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -2,6 +2,11 @@
public <init>(...);
}
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontwarn android.support.**
+
# Xml files containing onClick (menus and layouts) require that proguard not
# remove their handlers.
-keepclassmembers class * extends android.app.Activity {
diff --git a/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml
new file mode 100644
index 0000000..fbd7a09
--- /dev/null
+++ b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_add_contact_shortcut_background"/>
+ <foreground android:drawable="@drawable/ic_add_circle_24dp"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/res/drawable/ic_add_circle_24dp.xml b/res/drawable/ic_add_circle_24dp.xml
index ae37470..ebaab34 100644
--- a/res/drawable/ic_add_circle_24dp.xml
+++ b/res/drawable/ic_add_circle_24dp.xml
@@ -20,7 +20,7 @@
android:width="24dp"
android:viewportHeight="192.0"
android:viewportWidth="192.0">
- <path android:fillColor="#F5F5F5"
+ <path android:fillColor="@color/ic_add_contact_shortcut_background"
android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
<path android:fillColor="#039BE5"
android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
diff --git a/res/drawable/ic_add_contact_shortcut.xml b/res/drawable/ic_add_contact_shortcut.xml
new file mode 100644
index 0000000..85a7e61
--- /dev/null
+++ b/res/drawable/ic_add_contact_shortcut.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- A copy of ic_add_circle_24dp for use in pre O devices. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="192.0"
+ android:viewportWidth="192.0">
+ <path android:fillColor="@color/ic_add_contact_shortcut_background"
+ android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
+ <path android:fillColor="#039BE5"
+ android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
+</vector>
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/layout/select_dialog_item.xml b/res/layout/select_dialog_item.xml
index 1215aa9..05f2ae5 100644
--- a/res/layout/select_dialog_item.xml
+++ b/res/layout/select_dialog_item.xml
@@ -22,7 +22,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="wrap_content"
+ android:minHeight="56dp"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingEnd="24dp"
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d4d812c..fc5c553 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -216,7 +216,7 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Nenaslovljeni događaj)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Podesi"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"Razmena trenutnih poruka"</string>
+ <string name="header_im_entry" msgid="3581720979640225615">"Trenutne poruke"</string>
<string name="header_organization_entry" msgid="8515394955666265406">"Organizacija"</string>
<string name="header_nickname_entry" msgid="6743561883967451485">"Nadimak"</string>
<string name="header_note_entry" msgid="4320190426480612344">"Beleška"</string>
@@ -338,7 +338,7 @@
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefon"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"Imejl"</string>
<string name="postalLabelsGroup" msgid="3487738141112589324">"Adresa"</string>
- <string name="imLabelsGroup" msgid="3898238486262614027">"Razmena trenutnih poruka"</string>
+ <string name="imLabelsGroup" msgid="3898238486262614027">"Trenutne poruke"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizacija"</string>
<string name="relationLabelsGroup" msgid="1854373894284572781">"Odnos"</string>
<string name="eventLabelsGroup" msgid="7960408705307831289">"Poseban dan"</string>
@@ -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..1a31466 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -26,7 +26,7 @@
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Дадаць у кантакт"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Выберыце кантакт"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Выбраць"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Стварыць новы кантакт"</string>
+ <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Новы кантакт"</string>
<string name="searchHint" msgid="8482945356247760701">"Пошук кантактаў"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Дадаць у абраныя"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Выдаліць з абраных"</string>
@@ -187,9 +187,9 @@
<string name="clear_default" msgid="7193185801596678067">"Скінуць налады па змаўчанні"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Тэкст скапіяваны"</string>
<string name="cancel_confirmation_dialog_message" msgid="9008214737653278989">"Скасаваць змены?"</string>
- <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Адхіліць"</string>
+ <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Скасаваць"</string>
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"Скасаваць"</string>
- <string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Скасаваць карыст. выгляд?"</string>
+ <string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Скінуць налады?"</string>
<string name="enter_contact_name" msgid="4594274696120278368">"Пошук кантактаў"</string>
<string name="title_edit_group" msgid="8602752287270586734">"Выдаліць кантакты"</string>
<string name="local_profile_title" msgid="2021416826991393684">"Мой лакальны профіль"</string>
@@ -197,7 +197,7 @@
<string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Знайдзіце хвілінку, каб дадаць уліковы запіс, які дазволіць стварыць рэзервовую копію вашых кантактаў у Google."</string>
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Новыя кантакты будуць захаваны ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Выбраць уліковы запіс па змаўчанні для новых кантактаў:"</string>
- <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Стварыць новы кантакт"</string>
+ <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Новы кантакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Рэдагаваць кантакт"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Толькі прагляд"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Выбраць кантакт для рэдагавання"</string>
@@ -207,7 +207,7 @@
<string name="add_account" msgid="8201790677994503186">"Дадаць уліковы запіс"</string>
<string name="add_new_account" msgid="5748627740680940264">"Дадаць новы ўліковы запіс"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Экспарт базы дадзеных файлаў"</string>
- <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Стварыць новы кантакт"</string>
+ <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Новы кантакт"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Болей"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Паказаць менш"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Нядаўнія"</string>
@@ -258,7 +258,7 @@
<string name="navigation_drawer_label" msgid="4154758025620107419">"Метка <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Меткі"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Уліковыя запісы"</string>
- <string name="permission_explanation_header" msgid="5739405825039695327">"Паказваць усю гісторыю разам"</string>
+ <string name="permission_explanation_header" msgid="5739405825039695327">"Паказаць агульную гісторыю"</string>
<string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Падзеі і паведамленні"</string>
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Падзеі"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Паведамленні"</string>
@@ -390,9 +390,9 @@
<string name="announce_collapsed_fields" msgid="6414231530177338704">"Згорнута"</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"Усе кантакты"</string>
<string name="list_filter_all_starred" msgid="5031734941601931356">"Пазначана"</string>
- <string name="list_filter_customize" msgid="4789963356004169321">"Карыстальнiцкi"</string>
+ <string name="list_filter_customize" msgid="4789963356004169321">"Наладзіць"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Кантакт"</string>
- <string name="display_ungrouped" msgid="6885954210243119591">"Усе кантакты з тэчкі \"Іншыя\""</string>
+ <string name="display_ungrouped" msgid="6885954210243119591">"Усе іншыя кантакты"</string>
<string name="display_all_contacts" msgid="2031647544742889505">"Усе кантакты"</string>
<string name="menu_sync_remove" msgid="3266725887008450161">"Выдаліць групу сінхранізацыі"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"Дадаць групу сінхранізацыі"</string>
@@ -481,7 +481,7 @@
<string name="no_contact_to_share" msgid="1276397530378323033">"Няма кантактаў, якія можна абагуліць."</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Паказаць кантакты"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Адлюстроўваць кантакты"</string>
- <string name="custom_list_filter" msgid="9048525797111024204">"Наладзіць від"</string>
+ <string name="custom_list_filter" msgid="9048525797111024204">"Наладзіць прагляд"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Захаваць"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"Шукаць у кантактах"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Выбранае"</string>
@@ -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-bn/strings.xml b/res/values-bn/strings.xml
index da6f384..dce2ab3 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -41,7 +41,7 @@
<string name="menu_renameGroup" msgid="7169512355179757182">"লেবেলের পুনঃনামকরণ করুন"</string>
<string name="menu_deleteGroup" msgid="1126469629233412249">"লেবেল মুছুন"</string>
<string name="menu_addToGroup" msgid="3267409983764370041">"পরিচিতি যোগ করুন"</string>
- <string name="menu_selectForGroup" msgid="3999234528229376098">"পরিচিতিগুলিকে নির্বাচন করুন"</string>
+ <string name="menu_selectForGroup" msgid="3999234528229376098">"পরিচিতিগুলিকে বেছে নিন"</string>
<string name="menu_addContactsToGroup" msgid="655196688840626483">"পরিচিতিগুলি যোগ করুন"</string>
<string name="menu_removeFromGroup" msgid="6720354305399961978">"লেবেল থেকে সরান"</string>
<string name="menu_new_group_action_bar" msgid="3127059073617415221">"লেবেল তৈরি করুন"</string>
@@ -55,7 +55,7 @@
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"লিঙ্কমুক্ত করা হচ্ছে"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"লিঙ্ক করুন"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"লিঙ্ক করা পরিচিতিগুলি দেখুন"</string>
- <string name="menu_save" msgid="1727844363591825909">"সংরক্ষণ করুন"</string>
+ <string name="menu_save" msgid="1727844363591825909">"সেভ করুন"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"পরিচিতিগুলি লিঙ্ক করুন"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"যে পরিচিতিটিকে <xliff:g id="NAME">%s</xliff:g> এর সাথে লিঙ্ক করতে চান বেছে নিন:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"প্রস্তাবিত পরিচিতিগুলি"</string>
@@ -152,7 +152,7 @@
<string name="take_photo" msgid="7496128293167402354">"ফটো তুলুন"</string>
<string name="take_new_photo" msgid="7341354729436576304">"নতুন ফটো তুলুন"</string>
<string name="pick_photo" msgid="2129509985223564942">"ফটো বেছে নিন"</string>
- <string name="pick_new_photo" msgid="9122450996263688237">"নতুন ফটো নির্বাচন করুন"</string>
+ <string name="pick_new_photo" msgid="9122450996263688237">"নতুন ফটো বেছে নিন"</string>
<string name="search_results_searching" msgid="3984833028938569930">"অনুসন্ধান করছে..."</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"তারিখ"</string>
<string name="group_edit_field_hint_text" msgid="8038224059926963133">"লেবেল"</string>
@@ -190,7 +190,7 @@
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"নতুন পরিচিতিগুলি <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> এ সংরক্ষণ করা হবে৷"</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"নতুন পরিচিতিগুলির জন্য একটি ডিফল্ট অ্যাকাউন্ট বেছে নিন:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"নতুন পরিচিতি বানান"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"পরিচিতি সম্পাদনা করুন"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"পরিচিতি সম্পাদনা"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"কেবলমাত্র দেখার জন্য"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"সম্পাদনা করার জন্য একটি পরিচিতি বেছে নিন"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"লিঙ্ক করা পরিচিতিগুলি"</string>
@@ -200,8 +200,8 @@
<string name="add_new_account" msgid="5748627740680940264">"নতুন অ্যাকাউন্ট যোগ করুন"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ডেটাবেস ফাইলগুলি রপ্তানি করুন"</string>
<string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"নতুন পরিচিতি বানান"</string>
- <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"আরো দেখুন"</string>
- <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"আরো কম"</string>
+ <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"আরও দেখুন"</string>
+ <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"আরও কম"</string>
<string name="recent_card_title" msgid="8982782042698001695">"সাম্প্রতিক"</string>
<string name="about_card_title" msgid="2920942314212825637">"সম্পর্কে"</string>
<string name="toast_making_personal_copy" msgid="288549957278065542">"একটি ব্যক্তিগত অনুলিপি তৈরি করা হচ্ছে…"</string>
@@ -229,7 +229,7 @@
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"মিস করা"</string>
<string name="content_description_recent_call" msgid="5183800406316723676">"সাম্প্রতিক কল৷ <xliff:g id="CALL_TYPE">%1$s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>৷ <xliff:g id="DATE">%3$s</xliff:g>৷ ঘুরিয়ে কল করতে ক্লিক করুন"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"আপনি: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"আরো ফিল্ড"</string>
+ <string name="editor_more_fields" msgid="3630987771304393421">"আরও ফিল্ড"</string>
<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>
@@ -372,9 +372,9 @@
<string name="chat_jabber" msgid="7561444230307829609">"Jabber ব্যবহার করে চ্যাট করুন"</string>
<string name="chat" msgid="9025361898797412245">"চ্যাট"</string>
<string name="description_minus_button" msgid="6908099247930477551">"মুছুন"</string>
- <string name="expand_name_fields_description" msgid="6948274252874552543">"আরো নামের ক্ষেত্রগুলি দেখান"</string>
+ <string name="expand_name_fields_description" msgid="6948274252874552543">"আরও নামের ক্ষেত্রগুলি দেখান"</string>
<string name="collapse_name_fields_description" msgid="4757877385895561556">"নামের ক্ষেত্রটিকে সঙ্কুচিত করুন"</string>
- <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"আরো ফোনেটিক নামের ক্ষেত্রগুলি দেখান"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"আরও ফোনেটিক নামের ক্ষেত্রগুলি দেখান"</string>
<string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"ফোনেটিক নামের ক্ষেত্রটিকে প্রসারিত করুন"</string>
<string name="expand_fields_description" msgid="8129294181216760037">"প্রসারিত করুন"</string>
<string name="collapse_fields_description" msgid="1884143625854637874">"সঙ্কুচিত করুন"</string>
@@ -388,11 +388,11 @@
<string name="display_all_contacts" msgid="2031647544742889505">"সকল পরিচিতি"</string>
<string name="menu_sync_remove" msgid="3266725887008450161">"সমন্বয় গোষ্ঠী সরান"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"সমন্বয় গোষ্ঠী যোগ করুন"</string>
- <string name="display_more_groups" msgid="2682547080423434170">"আরো গোষ্ঠী…"</string>
+ <string name="display_more_groups" msgid="2682547080423434170">"আরও গোষ্ঠী…"</string>
<string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"সমন্বয় থেকে \"<xliff:g id="GROUP">%s</xliff:g>\" সরানো হলে তা সমন্বয় থেকে যেকোনো অগোষ্ঠীবদ্ধ পরিচিতিগুলিকেও সরাবে৷"</string>
<string name="savingDisplayGroups" msgid="2133152192716475939">"প্রদর্শনের বিকল্পগুলি সংরক্ষণ করা হচ্ছে..."</string>
<string name="listCustomView" msgid="1840624396582117590">"কাস্টমাইজ করা দৃশ্য"</string>
- <string name="dialog_new_contact_account" msgid="4969619718062454756">"আমদানি করা পরিচিতিগুলি এতে সংরক্ষণ করুন:"</string>
+ <string name="dialog_new_contact_account" msgid="4969619718062454756">"আমদানি করা পরিচিতিগুলি এতে সেভ করুন:"</string>
<string name="import_from_sim" msgid="6912071635295799131">"সিম কার্ড"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"সিম <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -505,7 +505,7 @@
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"এই শর্টকাটটি অক্ষম করা হয়েছে"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"পরিচিতিটি সরানো হয়েছে"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"আমদানি করুন"</string>
- <string name="sim_import_title_none_selected" msgid="6910517331401970693">"পরিচিতিগুলি নির্বাচন করুন"</string>
+ <string name="sim_import_title_none_selected" msgid="6910517331401970693">"পরিচিতিগুলি বেছে নিন"</string>
<string name="sim_import_empty_message" msgid="7743815244380189651">"আপনার সিম কার্ডে কোনো পরিচিতি নেই"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"পরিচিতিটি ইতিমধ্যেই আপনার তালিকাতে রয়েছে"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
@@ -523,7 +523,7 @@
<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">"সিম"</string>
- <string name="show_more_content_description" msgid="4277410425912984722">"আরো দেখান"</string>
+ <string name="show_more_content_description" msgid="4277410425912984722">"আরও দেখান"</string>
<string name="importing_sim_finished_title" msgid="5196369441294050721">"সিম কার্ড আমদানি করা সমাপ্ত হয়েছে"</string>
<string name="importing_sim_failed_title" msgid="39706901030537985">"আমদানি ব্যর্থ হয়েছে"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"সিম কার্ড থেকে পরিচিতিগুলি আমদানি করা গেল না"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ea786b7..091b09e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -27,7 +27,7 @@
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izaberi kontakt"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Odaberi"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Napravi novi kontakt"</string>
- <string name="searchHint" msgid="8482945356247760701">"Traži kontakte"</string>
+ <string name="searchHint" msgid="8482945356247760701">"Pretraži kontakte"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Dodaj u favorite"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Ukloni iz favorita"</string>
<string name="description_action_menu_remove_star" msgid="4699640108012265178">"Uklonjeno iz favorita"</string>
@@ -186,7 +186,7 @@
<string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Odbaci"</string>
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"Otkaži"</string>
<string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Odbaciti prilagođavanja?"</string>
- <string name="enter_contact_name" msgid="4594274696120278368">"Traži kontakte"</string>
+ <string name="enter_contact_name" msgid="4594274696120278368">"Pretraži kontakte"</string>
<string name="title_edit_group" msgid="8602752287270586734">"Ukloni kontakte"</string>
<string name="local_profile_title" msgid="2021416826991393684">"Moj lokalni profil"</string>
<string name="external_profile_title" msgid="8034998767621359438">"Moj profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
@@ -345,7 +345,7 @@
<string name="sms" msgid="1756857139634224222">"Tekstualna poruka"</string>
<string name="postal_address" msgid="8765560217149624536">"Adresa"</string>
<string name="ghostData_company" msgid="5414421120553765775">"Kompanija"</string>
- <string name="ghostData_title" msgid="7496735200318496110">"Naslov"</string>
+ <string name="ghostData_title" msgid="7496735200318496110">"Pozicija"</string>
<string name="label_notes" msgid="8337354953278341042">"Bilješke"</string>
<string name="label_custom_field" msgid="1994056912242214426">"Prilagođeno"</string>
<string name="label_sip_address" msgid="7252153678613978127">"SIP"</string>
@@ -477,7 +477,7 @@
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakti za prikaz"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"Prilagodi prikaz"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Sačuvaj"</string>
- <string name="hint_findContacts" msgid="7128627979899070325">"Traži kontakte"</string>
+ <string name="hint_findContacts" msgid="7128627979899070325">"Pretraži kontakte"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriti"</string>
<string name="menu_import" msgid="6107961135813836467">"Uvezi"</string>
<string name="menu_export" msgid="2658783911863503902">"Izvezi"</string>
@@ -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 cf747c2..ef0c46d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -99,10 +99,10 @@
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Foto de contacte"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nom de camp personalitzat"</string>
<string name="removePhoto" msgid="4898105274130284565">"Suprimeix la foto"</string>
- <string name="noContacts" msgid="2228592924476426108">"La llista de contactes està buida"</string>
+ <string name="noContacts" msgid="2228592924476426108">"La llista de contactes és buida"</string>
<string name="emptyGroup" msgid="5102411903247859575">"No hi ha cap contacte amb aquesta etiqueta"</string>
<string name="emptyAccount" msgid="6873962901497975964">"No hi ha cap contacte en aquest compte"</string>
- <string name="emptyMainList" msgid="2772242747899664460">"La llista de contactes està buida"</string>
+ <string name="emptyMainList" msgid="2772242747899664460">"La llista de contactes és buida"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> s\'ha desat"</string>
<string name="contactSavedToast" msgid="9171862279493213075">"S\'ha desat el contacte"</string>
<string name="contactUnlinkedToast" msgid="7122823195786012553">"Els contactes s\'han desenllaçat"</string>
@@ -449,7 +449,7 @@
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordena per"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nom fonètic"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Mostra sempre"</string>
- <string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Amaga si està buit"</string>
+ <string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Amaga si és buit"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nom"</string>
<string name="display_options_sort_by_family_name" msgid="2684905041926954793">"Cognoms"</string>
<string name="display_options_view_names_as" msgid="6514632499276563482">"Format del nom"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b15320a..25afdb4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -476,11 +476,11 @@
<string name="share_contacts" msgid="8109287987498711664">"Sdílet všechny kontakty"</string>
<string name="share_contacts_failure" msgid="1216431977330560559">"Kontakty se nepodařilo sdílet."</string>
<string name="dialog_export" msgid="1628001095187741417">"Exportovat kontakty"</string>
- <string name="dialog_import" msgid="2423592905927819672">"Importovat kontakty z umístění"</string>
+ <string name="dialog_import" msgid="2423592905927819672">"Importovat kontakty z:"</string>
<string name="share_error" msgid="948429331673358107">"Tento kontakt nelze sdílet."</string>
<string name="no_contact_to_share" msgid="1276397530378323033">"Nejsou dostupné žádné kontakty ke sdílení."</string>
- <string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakty k zobrazení"</string>
- <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakty k zobrazení"</string>
+ <string name="menu_contacts_filter" msgid="2165153460860262501">"Zobrazit kontakty"</string>
+ <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Zobrazit kontakty"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"Přizpůsobit zobrazení"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Uložit"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"Vyhledejte kontakty"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2381a4e..21b9105 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -245,8 +245,8 @@
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Slet <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Forslag"</string>
<string name="menu_assistant_new_badge" msgid="3132884821616980034">"Nyt"</string>
- <string name="navigation_drawer_open" msgid="1126498472143250642">"Åbn navigationsskuffen"</string>
- <string name="navigation_drawer_close" msgid="4137416137011817930">"Luk navigationsskuffen"</string>
+ <string name="navigation_drawer_open" msgid="1126498472143250642">"Åbn sidemenuen"</string>
+ <string name="navigation_drawer_close" msgid="4137416137011817930">"Luk sidemenuen"</string>
<string name="navigation_drawer_label" msgid="4154758025620107419">"Etiketten <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Etiketter"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Konti"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3edd3b6..803c8e4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -324,9 +324,9 @@
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"Spitzname"</string>
<string name="name_given" msgid="4280790853455320619">"Vorname"</string>
<string name="name_family" msgid="7466985689626017037">"Nachname"</string>
- <string name="name_prefix" msgid="59756378548779822">"Namenpräfix"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Namenspräfix"</string>
<string name="name_middle" msgid="8467433655992690326">"Zweiter Vorname"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Namensuffix"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Namenssuffix"</string>
<string name="name_phonetic" msgid="4259595234312430484">"Phonetischer Name"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Vorname (phonetisch)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Zweiter Vorname (phonetisch)"</string>
@@ -359,7 +359,7 @@
<string name="postal_postcode" msgid="572136414136673751">"Postleitzahl"</string>
<string name="postal_country" msgid="7638264508416368690">"Land"</string>
<string name="map_home" msgid="1243547733423343982">"Privatadresse anzeigen"</string>
- <string name="map_work" msgid="1360474076921878088">"Geschäftsadresse anzeigen"</string>
+ <string name="map_work" msgid="1360474076921878088">"Arbeitsadresse anzeigen"</string>
<string name="map_other" msgid="3817820803587012641">"Adresse anzeigen"</string>
<string name="map_custom" msgid="8761800628069473526">"Adresse <xliff:g id="CUSTOM_LABEL">%s</xliff:g> anzeigen"</string>
<string name="chat_aim" msgid="2588492205291249142">"Über AIM chatten"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 07335de..c03263a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,7 +23,7 @@
<string name="shortcutDialContact" msgid="746622101599186779">"Llamada directa"</string>
<string name="shortcutMessageContact" msgid="2460337253595976198">"Mensaje directo"</string>
<string name="shortcutActivityTitle" msgid="1504383567778497348">"Elegir contacto"</string>
- <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Añadir al contacto"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Añadir a un contacto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Elige un contacto"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Seleccionar"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear nuevo contacto"</string>
@@ -54,14 +54,14 @@
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Vinculando"</string>
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Desvinculando"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Vincular"</string>
- <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos enlazados"</string>
+ <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos vinculados"</string>
<string name="menu_save" msgid="1727844363591825909">"Guardar"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Vincular contactos"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecciona el contacto que quieras vincular con <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
- <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> enlazado"</string>
- <string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos enlazados"</string>
+ <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> vinculado"</string>
+ <string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos vinculados"</string>
<string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Se ha eliminado a <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g> y a <xliff:g id="NAME_1">%2$s</xliff:g>"</string>
<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>…"</string>
@@ -108,7 +108,7 @@
<string name="contactUnlinkedToast" msgid="7122823195786012553">"Contactos desvinculados"</string>
<string name="contactSavedErrorToast" msgid="4827033473908688031">"No se han podido guardar los cambios en el contacto"</string>
<string name="contactUnlinkErrorToast" msgid="2706297508166952431">"No se ha podido desvincular el contacto"</string>
- <string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido enlazar el contacto"</string>
+ <string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido vincular el contacto"</string>
<string name="contactGenericErrorToast" msgid="3885457515665783976">"No se ha podido guardar el contacto"</string>
<string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"No se han podido guardar los cambios en la foto del contacto"</string>
<string name="groupLoadErrorToast" msgid="7536267148196064554">"No se ha podido cargar la etiqueta"</string>
@@ -193,7 +193,7 @@
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Solo lectura"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Seleccionar contacto para editarlo"</string>
- <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos enlazados"</string>
+ <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos vinculados"</string>
<string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Añadir"</string>
<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Desvincular"</string>
<string name="add_account" msgid="8201790677994503186">"Añadir cuenta"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5a0f51f..a70087e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -135,7 +135,7 @@
<string name="missing_app" msgid="1466111003546611387">"Selle toimingu käsitlemiseks ei leitud ühtegi rakendust."</string>
<string name="menu_share" msgid="943789700636542260">"Jaga"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"Lisa kontaktide hulka"</string>
- <string name="menu_add_contacts" msgid="4465646512002163011">"Lisamine"</string>
+ <string name="menu_add_contacts" msgid="4465646512002163011">"Lisa"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
<item quantity="other">Kontaktide jagamine rakendusega</item>
<item quantity="one">Kontakti jagamine rakendusega</item>
@@ -194,7 +194,7 @@
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Vaid vaatamiseks"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Valige kontakt, mida soovite muuta"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Lingitud kontaktid"</string>
- <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Lisamine"</string>
+ <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Lisa"</string>
<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Link. tühistam."</string>
<string name="add_account" msgid="8201790677994503186">"Konto lisamine"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisa uus konto"</string>
@@ -445,8 +445,8 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt võeti vastu NFC kaudu"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Vahemällu salvestamine"</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Importimine: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
- <string name="export_to_vcf_file" msgid="4407527157056120858">"Eksportimine VCF-faili"</string>
- <string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortimisalus:"</string>
+ <string name="export_to_vcf_file" msgid="4407527157056120858">"Ekspordi VCF-faili"</string>
+ <string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortimisalus"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Foneetiline nimi"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Kuva alati"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Peida, kui see on tühi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 688e0cd..a600987 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -456,7 +456,7 @@
<string name="display_options_view_given_name_first" msgid="3616004640258761473">"Prénom en premier"</string>
<string name="display_options_view_family_name_first" msgid="956445100777296467">"Nom de famille en premier"</string>
<string name="settings_accounts" msgid="350219740670774576">"Comptes"</string>
- <string name="default_editor_account" msgid="699591683362420991">"Compte par défaut pour nouveaux contacts"</string>
+ <string name="default_editor_account" msgid="699591683362420991">"Compte par défaut pour les nouveaux contacts"</string>
<string name="settings_my_info_title" msgid="1534272456405343119">"Mon profil"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Configurer votre profil"</string>
<string name="setting_about" msgid="7014388749752042863">"À propos de Contacts"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6abc4e7..ec72d11 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -324,9 +324,9 @@
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"Alcume"</string>
<string name="name_given" msgid="4280790853455320619">"Nome"</string>
<string name="name_family" msgid="7466985689626017037">"Apelidos"</string>
- <string name="name_prefix" msgid="59756378548779822">"Tratamento do nome"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Forma de tratamento"</string>
<string name="name_middle" msgid="8467433655992690326">"Segundo nome"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Información profesional do nome"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Título académico ou profesional"</string>
<string name="name_phonetic" msgid="4259595234312430484">"Nome fonético"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Nome fonético"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Segundo nome fonético"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 70ee150..26a6250 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -110,7 +110,7 @@
<string name="contactUnlinkErrorToast" msgid="2706297508166952431">"સંપર્કને અનલિંક કરી શક્યા નથી"</string>
<string name="contactJoinErrorToast" msgid="5735129234573327701">"સંપર્ક લિંક કરી શક્યાં નથી"</string>
<string name="contactGenericErrorToast" msgid="3885457515665783976">"સંપર્ક સાચવવામાં ભૂલ"</string>
- <string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"સંપર્ક ફોટાના ફેરફારો સાચવી શક્યાં નથી"</string>
+ <string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"સંપર્ક ફોટોનાં ફેરફારો સાચવી શક્યાં નથી"</string>
<string name="groupLoadErrorToast" msgid="7536267148196064554">"લેબલ લોડ કરવામાં નિષ્ફળ થયાં"</string>
<string name="groupDeletedToast" msgid="520896687873262027">"લેબલ કાઢી નાખ્યું"</string>
<string name="groupCreatedToast" msgid="1924195126172834870">"લેબલ બનાવ્યું"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 551e3c6..064f606 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -200,8 +200,8 @@
<string name="add_new_account" msgid="5748627740680940264">"Új fiók hozzáadása"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Adatbázisfájlok exportálása"</string>
<string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Új névjegy létrehozása"</string>
- <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Továbbiak"</string>
- <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kevesebb megjelenítése"</string>
+ <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Több"</string>
+ <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kevesebb"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Legutóbbiak"</string>
<string name="about_card_title" msgid="2920942314212825637">"Névjegy"</string>
<string name="toast_making_personal_copy" msgid="288549957278065542">"Személyes másolat készítése..."</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 479c7a6..cf9fd75 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -329,7 +329,7 @@
<string name="name_suffix" msgid="3855278445375651441">"სახელის სუფიქსი"</string>
<string name="name_phonetic" msgid="4259595234312430484">"სახელის ტრანსკრიფცია"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"სახელი (ტრანსკრიფცია)"</string>
- <string name="name_phonetic_middle" msgid="8643721493320405200">"მეორე სახელის ტრანსკრიფცია"</string>
+ <string name="name_phonetic_middle" msgid="8643721493320405200">"მეორე სახელი (ტრანსკრიფცია)"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"გვარი (ტრანსკრიფცია)"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"ტელეფონი"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"ელფოსტა"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3625f84..903105e 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -100,7 +100,7 @@
<string name="customLabelPickerTitle" msgid="1081475101983255212">"ಕಸ್ಟಮ್ ಲೇಬಲ್ ಹೆಸರು"</string>
<string name="removePhoto" msgid="4898105274130284565">"ಫೋಟೋ ತೆಗೆದುಹಾಕಿ"</string>
<string name="noContacts" msgid="2228592924476426108">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
- <string name="emptyGroup" msgid="5102411903247859575">"ಈ ಲೇಬಲ್ ಹೊಂದಿರುವ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
+ <string name="emptyGroup" msgid="5102411903247859575">"ಈ ಲೇಬಲ್ನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
<string name="emptyAccount" msgid="6873962901497975964">"ಈ ಖಾತೆಯಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
<string name="emptyMainList" msgid="2772242747899664460">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಉಳಿಸಲಾಗಿದೆ"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 597014c..fc724ef 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -37,7 +37,7 @@
<string name="menu_change_photo" msgid="7769177631511496210">"ഫോട്ടോ മാറ്റുക"</string>
<string name="menu_create_contact_shortcut" msgid="1663022219127343858">"കുറുക്കുവഴി സൃഷ്ടിക്കുക"</string>
<string name="menu_splitAggregate" msgid="2627252205317945563">"അൺലിങ്കുചെയ്യുക"</string>
- <string name="menu_editGroup" msgid="6696843438454341063">"കോൺടാക്റ്റുകൾ നീക്കംചെയ്യൂ"</string>
+ <string name="menu_editGroup" msgid="6696843438454341063">"കോൺടാക്റ്റ് നീക്കംചെയ്യൂ"</string>
<string name="menu_renameGroup" msgid="7169512355179757182">"ലേബലിന്റെ പേരുമാറ്റുക"</string>
<string name="menu_deleteGroup" msgid="1126469629233412249">"ലേബല് ഇല്ലാതാക്കുക"</string>
<string name="menu_addToGroup" msgid="3267409983764370041">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
@@ -55,7 +55,7 @@
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"അൺലിങ്കുചെയ്യുന്നു"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"ലിങ്ക്"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"ലിങ്കുചെയ്ത കോൺടാക്റ്റുകൾ കാണുക"</string>
- <string name="menu_save" msgid="1727844363591825909">"സംരക്ഷിക്കുക"</string>
+ <string name="menu_save" msgid="1727844363591825909">"സംരക്ഷിക്കൂ"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"കോണ്ടാക്റ്റുകൾ ലിങ്കുചെയ്യൂ"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"<xliff:g id="NAME">%s</xliff:g> എന്നയാളുമായി ലിങ്കുചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്ന കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"നിര്ദ്ദേശിക്കുന്ന കോണ്ടാക്റ്റുകള്"</string>
@@ -183,7 +183,7 @@
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"റദ്ദാക്കൂ"</string>
<string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"ഇഷ്ടാനുസൃതമാക്കലുകൾ നിരസിക്കണോ?"</string>
<string name="enter_contact_name" msgid="4594274696120278368">"കോണ്ടാക്റ്റുകള് തിരയുക"</string>
- <string name="title_edit_group" msgid="8602752287270586734">"കോൺടാക്റ്റുകൾ നീക്കംചെയ്യൂ"</string>
+ <string name="title_edit_group" msgid="8602752287270586734">"കോൺടാക്റ്റ് നീക്കംചെയ്യൂ"</string>
<string name="local_profile_title" msgid="2021416826991393684">"എന്റെ പ്രാദേശിക പ്രൊഫൈൽ"</string>
<string name="external_profile_title" msgid="8034998767621359438">"എന്റെ <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> പ്രൊഫൈൽ"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"കുറച്ചുസമയമെടുത്ത് ഒരു അക്കൗണ്ട് ചേർക്കുക, അത് Google-ൽ നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ ബായ്ക്കപ്പെടുക്കുന്നതിനിടയാക്കും."</string>
@@ -470,7 +470,7 @@
<string name="menu_contacts_filter" msgid="2165153460860262501">"ദൃശ്യമാക്കേണ്ട കോൺടാക്റ്റുകൾ"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"ദൃശ്യമാക്കേണ്ട കോൺടാക്റ്റുകൾ"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"കാഴ്ച ഇഷ്ടാനുസൃതമാക്കൂ"</string>
- <string name="menu_custom_filter_save" msgid="2679793632208086460">"സംരക്ഷിക്കുക"</string>
+ <string name="menu_custom_filter_save" msgid="2679793632208086460">"സംരക്ഷിക്കൂ"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"കോണ്ടാക്റ്റുകള് തിരയുക"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"പ്രിയപ്പെട്ടവ"</string>
<string name="menu_import" msgid="6107961135813836467">"ഇമ്പോർട്ടുചെയ്യുക"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index cec4a15..4aa7917 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -115,7 +115,7 @@
<string name="groupDeletedToast" msgid="520896687873262027">"लेबल हटविले"</string>
<string name="groupCreatedToast" msgid="1924195126172834870">"लेबल तयार केले"</string>
<string name="groupCreateFailedToast" msgid="4359093891863474299">"लेबल तयार करू शकत नाही"</string>
- <string name="groupUpdatedToast" msgid="3667977658676267687">"लेबल अद्यतनित केले"</string>
+ <string name="groupUpdatedToast" msgid="3667977658676267687">"लेबल अपडेट केले"</string>
<string name="groupMembersRemovedToast" msgid="3510563559799376603">"लेबल मधून काढले"</string>
<string name="groupMembersAddedToast" msgid="4824834898718972768">"लेबलमध्ये जोडले"</string>
<string name="groupSavedErrorToast" msgid="2355891714292740162">"लेबल बदल जतन करणे शक्य झाले नाही"</string>
@@ -317,14 +317,14 @@
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"वारंवार संपर्क केलेले"</string>
<string name="list_filter_phones" msgid="735313795643493365">"फोन नंबरसह सर्व संपर्क"</string>
<string name="list_filter_phones_work" msgid="1470173699551475015">"कार्य प्रोफाईल संपर्क"</string>
- <string name="view_updates_from_group" msgid="1782685984905600034">"अद्यतने पहा"</string>
+ <string name="view_updates_from_group" msgid="1782685984905600034">"अपडेट पहा"</string>
<string name="account_phone" msgid="7128032778471187553">"डिव्हाइस"</string>
<string name="account_sim" msgid="6519016427905087952">"सिम"</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"नाव"</string>
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"टोपणनाव"</string>
<string name="name_given" msgid="4280790853455320619">"नाव"</string>
<string name="name_family" msgid="7466985689626017037">"आडनाव"</string>
- <string name="name_prefix" msgid="59756378548779822">"नाव प्रत्यय"</string>
+ <string name="name_prefix" msgid="59756378548779822">"नाव उपसर्ग"</string>
<string name="name_middle" msgid="8467433655992690326">"मधले नाव"</string>
<string name="name_suffix" msgid="3855278445375651441">"नाव"</string>
<string name="name_phonetic" msgid="4259595234312430484">"ध्वन्यात्मक नाव"</string>
@@ -519,7 +519,7 @@
<string name="dismiss_sync_alert" msgid="8941131776605093596">"डिसमिस करा"</string>
<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">"फक्त संपर्कांमध्ये नाही, तर आपण सर्व अॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अद्यतनित ठेवले जातील."</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"फक्त संपर्कांमध्ये नाही, तर आपण सर्व अॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अपडेट ठेवले जातील."</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">"सिम"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b7a9f91..0dd7ed8 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -491,7 +491,7 @@
<string name="about_open_source_licenses" msgid="6479990452352919641">"खुला स्रोतका इजाजतपत्रहरू"</string>
<string name="about_open_source_licenses_summary" msgid="57418386931763994">"खुला स्रोतको सफ्टवेयरका लागि इजाजतपत्रका विवरणहरू"</string>
<string name="about_privacy_policy" msgid="3705518622499152626">"गोपनीयता नीति"</string>
- <string name="about_terms_of_service" msgid="4642400812150296723">"सेवा सर्तहरू"</string>
+ <string name="about_terms_of_service" msgid="4642400812150296723">"सेवाका सर्तहरू"</string>
<string name="activity_title_licenses" msgid="5467767062737708066">"खुला स्रोतका इजाजतपत्रहरू"</string>
<string name="url_open_error_toast" msgid="452592089815420457">"url खोल्न सकिएन।"</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> जाँच गरियो"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7fc42e7..25a381e 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -93,8 +93,8 @@
<string name="deleteConfirmation" msgid="3512271779086656043">"ਕੀ ਇਸ ਸੰਪਰਕ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
<string name="deleteConfirmation_positive_button" msgid="7857888845028586365">"ਹਟਾਓ"</string>
<string name="invalidContactMessage" msgid="8215051456181842274">"ਸੰਪਰਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
- <string name="createContactShortcutSuccessful_NoName" msgid="8831303345367275472">"ਸੰਪਰਕ ਮੁੱਖ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
- <string name="createContactShortcutSuccessful" msgid="953651153238790069">"<xliff:g id="NAME">%s</xliff:g> ਮੁੱਖ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="createContactShortcutSuccessful_NoName" msgid="8831303345367275472">"ਸੰਪਰਕ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="createContactShortcutSuccessful" msgid="953651153238790069">"<xliff:g id="NAME">%s</xliff:g> ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
<string name="photoPickerNotFoundText" msgid="2052542573853433204">"ਡੀਵਾਈਸ \'ਤੇ ਕੋਈ ਤਸਵੀਰਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ।"</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"ਸੰਪਰਕ ਫ਼ੋਟੋ"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"ਵਿਸ਼ੇਸ਼=ਵਿਉਂਤਬੱਧ ਲੇਬਲ ਨਾਮ"</string>
@@ -372,9 +372,9 @@
<string name="chat_jabber" msgid="7561444230307829609">"Jabber ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
<string name="chat" msgid="9025361898797412245">"ਚੈਟ"</string>
<string name="description_minus_button" msgid="6908099247930477551">"ਮਿਟਾਓ"</string>
- <string name="expand_name_fields_description" msgid="6948274252874552543">"ਹੋਰ ਨਾਮ ਖੇਤਰ ਵਿਖਾਓ"</string>
+ <string name="expand_name_fields_description" msgid="6948274252874552543">"ਹੋਰ ਨਾਮ ਖੇਤਰ ਦਿਖਾਓ"</string>
<string name="collapse_name_fields_description" msgid="4757877385895561556">"ਨਾਮ ਖੇਤਰਾਂ ਨੂੰ ਸੁੰਗੇੜੋ"</string>
- <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"ਹੋਰ ਧੁਨੀਆਤਮਿਕ ਨਾਮ ਖੇਤਰ ਵਿਖਾਓ"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"ਹੋਰ ਧੁਨੀਆਤਮਿਕ ਨਾਮ ਖੇਤਰ ਦਿਖਾਓ"</string>
<string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"ਫ਼ੋਨੈਟਿਕ ਨਾਮ ਖੇਤਰਾਂ ਨੂੰ ਸੁੰਗੇੜੋ"</string>
<string name="expand_fields_description" msgid="8129294181216760037">"ਵਿਸਤਾਰ ਕਰੋ"</string>
<string name="collapse_fields_description" msgid="1884143625854637874">"ਸੁੰਗੇੜੋ"</string>
@@ -423,15 +423,15 @@
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ, ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸੂਚਨਾ \'ਤੇ ਕਲਿੱਕ ਕਰੋ।"</string>
<string name="touch_to_share_contacts" msgid="4882485525268469736">"ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
- <string name="exporting_contact_list_title" msgid="9072240631534457415">"ਸੰਪਰਕ ਡੈਟਾ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="exporting_contact_list_message" msgid="3367949209642931952">"ਸੰਪਰਕ ਡੈਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
+ <string name="exporting_contact_list_title" msgid="9072240631534457415">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="exporting_contact_list_message" msgid="3367949209642931952">"ਸੰਪਰਕ ਡਾਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"ਡੈਟਾਬੇਸ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"</string>
<string name="composer_has_no_exportable_contact" msgid="5712531702823346549">"ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"vCard ਕੰਪੋਜ਼ਰ ਸਹੀ ਢੰਗ ਨਾਲ ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ।"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"ਨਿਰਯਾਤ ਨਹੀਂ ਹੋ ਸਕਿਆ"</string>
- <string name="exporting_contact_failed_message" msgid="4938527850142003141">"ਸੰਪਰਕ ਡੈਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+ <string name="exporting_contact_failed_message" msgid="4938527850142003141">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> ਆਯਾਤ ਹੋ ਰਿਹਾ ਹੈ"</string>
- <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard ਡੈਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
+ <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"</string>
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਆਯਾਤ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
@@ -448,7 +448,7 @@
<string name="export_to_vcf_file" msgid="4407527157056120858">".vcf ਫ਼ਾਈਲ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"ਧੁਨੀਆਤਮਿਕ ਨਾਮ"</string>
- <string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"ਹਮੇਸ਼ਾ ਵਿਖਾਓ"</string>
+ <string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"ਹਮੇਸ਼ਾ ਦਿਖਾਓ"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"ਲੁਕਾਓ ਜੇਕਰ ਖਾਲੀ ਹੈ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ਨਾਮ ਦਾ ਪਹਿਲਾ ਭਾਗ"</string>
<string name="display_options_sort_by_family_name" msgid="2684905041926954793">"ਨਾਮ ਦਾ ਆਖਰੀ ਭਾਗ"</string>
@@ -506,7 +506,7 @@
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ਸੰਪਰਕ ਹਟਾਇਆ ਗਿਆ ਸੀ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ਆਯਾਤ ਕਰੋ"</string>
<string name="sim_import_title_none_selected" msgid="6910517331401970693">"ਸੰਪਰਕ ਚੁਣੋ"</string>
- <string name="sim_import_empty_message" msgid="7743815244380189651">"ਤੁਹਾਡੇ SIM ਕਾਰਡ \'ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
+ <string name="sim_import_empty_message" msgid="7743815244380189651">"ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ \'ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਮੌਜੂਦ ਹੈ"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> SIM ਸੰਪਰਕ ਆਯਾਤ ਕੀਤੇ ਗਏ</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2c31633..c18ad3c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -335,7 +335,7 @@
<string name="name_prefix" msgid="59756378548779822">"Przedrostek nazwiska"</string>
<string name="name_middle" msgid="8467433655992690326">"Drugie imię"</string>
<string name="name_suffix" msgid="3855278445375651441">"Przyrostek nazwiska"</string>
- <string name="name_phonetic" msgid="4259595234312430484">"Nazwa (fonetycznie)"</string>
+ <string name="name_phonetic" msgid="4259595234312430484">"Nazwisko (fonetycznie)"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Imię (fonetycznie)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Drugie imię (fonetycznie)"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"Nazwisko (fonetycznie)"</string>
@@ -353,7 +353,7 @@
<string name="label_notes" msgid="8337354953278341042">"Notatki"</string>
<string name="label_custom_field" msgid="1994056912242214426">"Niestandardowe"</string>
<string name="label_sip_address" msgid="7252153678613978127">"Adres SIP"</string>
- <string name="websiteLabelsGroup" msgid="4202998982804009261">"Adres witryny"</string>
+ <string name="websiteLabelsGroup" msgid="4202998982804009261">"Strona internetowa"</string>
<string name="groupsLabel" msgid="7000816729542098972">"Etykiety"</string>
<string name="email_home" msgid="8573740658148184279">"E-mail – domowy"</string>
<string name="email_mobile" msgid="2042889209787989814">"E-mail – komórka"</string>
@@ -459,7 +459,7 @@
<string name="progress_notifier_message" msgid="2311011466908220528">"Importowanie <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="4407527157056120858">"Eksportuj do pliku .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortuj według"</string>
- <string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nazwa (fonetycznie)"</string>
+ <string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nazwisko (fonetycznie)"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Zawsze pokazuj"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Ukryj, jeśli puste"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Imię"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51b62a9..2a2abe9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -312,7 +312,7 @@
<string name="directory_search_label" msgid="1887759056597975053">"Saraka"</string>
<string name="directory_search_label_work" msgid="8618292129829443176">"Anwani za kazi"</string>
<string name="local_search_label" msgid="2551177578246113614">"Anwani zote"</string>
- <string name="description_quick_contact_for" msgid="6737516415168327789">"Mwasiliani wa haraka wa <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="description_quick_contact_for" msgid="6737516415168327789">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="missing_name" msgid="8745511583852904385">"(Hakuna jina)"</string>
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"Unaowasiliana nao zaidi"</string>
<string name="list_filter_phones" msgid="735313795643493365">"Anwani zote zilizo na nambari za simu"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fe4817f..4794935 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -24,7 +24,7 @@
<string name="shortcutMessageContact" msgid="2460337253595976198">"நேரடி செய்தி"</string>
<string name="shortcutActivityTitle" msgid="1504383567778497348">"தொடர்பைத் தேர்வுசெய்க"</string>
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"தொடர்பில் சேர்"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"தொடர்பைத் தேர்வுசெய்யவும்"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"தொடர்பைத் தேர்வுசெய்க"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"தேர்ந்தெடுக்கவும்"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"புதிய தொடர்பை உருவாக்கவும்"</string>
<string name="searchHint" msgid="8482945356247760701">"தொடர்புகளைத் தேடு"</string>
@@ -312,7 +312,7 @@
<string name="directory_search_label" msgid="1887759056597975053">"கோப்பகம்"</string>
<string name="directory_search_label_work" msgid="8618292129829443176">"பணிக் கோப்பகம்"</string>
<string name="local_search_label" msgid="2551177578246113614">"எல்லா தொடர்புகளும்"</string>
- <string name="description_quick_contact_for" msgid="6737516415168327789">"<xliff:g id="NAME">%1$s</xliff:g> க்கான உடனடித் தொடர்பு"</string>
+ <string name="description_quick_contact_for" msgid="6737516415168327789">"<xliff:g id="NAME">%1$s</xliff:g> க்கான விரைவுத் தொடர்பு"</string>
<string name="missing_name" msgid="8745511583852904385">"(பெயர் இல்லை)"</string>
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"அடிக்கடி தொடர்புகொண்டவர்கள்"</string>
<string name="list_filter_phones" msgid="735313795643493365">"மொபைல் எண்களுடனான எல்லா தொடர்புகளும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9d3efd6..327fb29 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -329,7 +329,7 @@
<string name="name_suffix" msgid="3855278445375651441">"పేరు అంత్యప్రత్యయం"</string>
<string name="name_phonetic" msgid="4259595234312430484">"ఫోనెటిక్ రూపంలో పేరు"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"ఫొనెటిక్ మొదటి పేరు"</string>
- <string name="name_phonetic_middle" msgid="8643721493320405200">"ఫోనెటిక్ మధ్య పేరు"</string>
+ <string name="name_phonetic_middle" msgid="8643721493320405200">"ఫొనెటిక్ మధ్య పేరు"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"ఫొనెటిక్ చివరి పేరు"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"ఫోన్"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"ఇమెయిల్"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 16671a3..6121f28 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -301,7 +301,7 @@
<string name="sms_assistant" msgid="2773424339923116234">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="4069352461380762677">"ส่งข้อความถึง MMS"</string>
<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ข้อความ)"</string>
- <string name="description_video_call" msgid="7120921378651700947">"ใช้แฮงเอาท์วิดีโอ"</string>
+ <string name="description_video_call" msgid="7120921378651700947">"ใช้ Hangouts วิดีโอ"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"ล้างผู้ที่คุณติดต่อด้วยบ่อยๆ หรือไม่"</string>
<string name="clearFrequentsConfirmation" msgid="2270554975938265734">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contact และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"กำลังล้างผู้ที่คุณติดต่อด้วยบ่อยๆ…"</string>
@@ -496,7 +496,7 @@
<string name="url_open_error_toast" msgid="452592089815420457">"เปิด URL ไม่สำเร็จ"</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g> แล้ว"</string>
<string name="account_filter_view_not_checked" msgid="2248684521205038389">"ไม่ได้เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
- <string name="description_search_video_call" msgid="5841525580339803272">"เริ่มแฮงเอาท์วิดีโอ"</string>
+ <string name="description_search_video_call" msgid="5841525580339803272">"เริ่ม Hangouts วิดีโอ"</string>
<string name="description_delete_contact" msgid="53835657343783663">"ลบ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"จุดไข่ปลา"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 294e7da..5ad346f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -101,7 +101,7 @@
<string name="removePhoto" msgid="4898105274130284565">"Alisin ang larawan"</string>
<string name="noContacts" msgid="2228592924476426108">"Walang laman ang iyong listahan ng mga contact"</string>
<string name="emptyGroup" msgid="5102411903247859575">"Walang mga contact na mayroong ganitong label"</string>
- <string name="emptyAccount" msgid="6873962901497975964">"Walang mga contact sa account na ito"</string>
+ <string name="emptyAccount" msgid="6873962901497975964">"Walang contact sa account na ito"</string>
<string name="emptyMainList" msgid="2772242747899664460">"Walang laman ang iyong listahan ng mga contact"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"Na-save si <xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
<string name="contactSavedToast" msgid="9171862279493213075">"Na-save ang contact"</string>
@@ -200,7 +200,7 @@
<string name="add_new_account" msgid="5748627740680940264">"Magdagdag ng bagong account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"I-export ang mga file ng database"</string>
<string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Gumawa ng bagong contact"</string>
- <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Tumingin nang higit pa"</string>
+ <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Tumingin pa"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Tumingin nang mas kaunti"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Kamakailan"</string>
<string name="about_card_title" msgid="2920942314212825637">"Tungkol dito"</string>
@@ -229,7 +229,7 @@
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string>
<string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. mag-click upang tumawag"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Higit pang mga field"</string>
+ <string name="editor_more_fields" msgid="3630987771304393421">"Higit pang field"</string>
<string name="editor_change_photo_content_description" msgid="820879708069864340">"Baguhin ang larawan ng contact"</string>
<string name="editor_add_photo_content_description" msgid="4194479313465418120">"Magdagdag ng larawan ng contact"</string>
<string name="editor_contact_photo_content_description" msgid="8571975622926162369">"Larawan ng contact"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4b64456..c4af9bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -279,7 +279,7 @@
<string name="call_assistant" msgid="670941612175068337">"Telefon et: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_mms" msgid="6274041545876221437">"Çağrı yap (MMS)"</string>
<string name="call_by_shortcut" msgid="2566802538698913124">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefon et)"</string>
- <string name="sms_custom" msgid="415060214233647603">"Kısa mesaj gönder: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
+ <string name="sms_custom" msgid="415060214233647603">"SMS gönder: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="7524332261493162995">"SMS gönder (ev)"</string>
<string name="sms_mobile" msgid="5200107250451030769">"SMS gönder (mobil)"</string>
<string name="sms_work" msgid="2269624156655267740">"SMS gönder (iş)"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e394ea3..f5d40ec 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -198,7 +198,7 @@
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Нові контакти буде збережено в обліковому записі <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Виберіть обліковий запис за умовчанням для нових контактів:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Створити новий контакт"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Змінити контакт"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Редагувати контакт"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Лише перегляд"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Вибрати контакт для редагування"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Об’єднані контакти"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 29477bb..4981f7f 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -122,7 +122,7 @@
<string name="groupExistsErrorMessage" msgid="5196811283836946189">"Bunday yorliq allaqachon mavjud"</string>
<string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Ayrim kontaktlarda e-pochta manz. ko‘rsatilmagan."</string>
<string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Ayrim kontaktlarda telefon raqami ko‘rsatilmagan."</string>
- <string name="menu_sendEmailOption" msgid="5978319931321657780">"E-pochta orqali xat yuborish"</string>
+ <string name="menu_sendEmailOption" msgid="5978319931321657780">"E-maktub yuborish"</string>
<string name="menu_sendMessageOption" msgid="8850168125274916426">"SMS yuborish"</string>
<string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Kontaktlarni tanlang"</string>
<string name="send_to_selection" msgid="2251339182881603540">"Yuborish"</string>
diff --git a/res/values-v26/dimens.xml b/res/values-v26/dimens.xml
new file mode 100644
index 0000000..b5737f2
--- /dev/null
+++ b/res/values-v26/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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>
+ <!-- On Android O, shortcut icons will be 108dp unmasked.
+ See go/o-icons-eng for more details. -->
+ <dimen name="shortcut_icon_size">108dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1aa84c6..e311ff3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,6 +16,7 @@
<resources>
<!-- Adaptive icon background layer color -->
<color name="ic_contacts_launcher_background">#2458CA</color>
+ <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
<!-- 87% black -->
<color name="quantum_black_text">#dd000000</color>
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/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index c33893a..7ce90e6 100644
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -17,7 +17,7 @@
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:enabled="true"
- android:icon="@drawable/ic_add_circle_24dp"
+ android:icon="@drawable/ic_add_contact_shortcut"
android:shortcutId="shortcut-add-contact"
android:shortcutShortLabel="@string/shortcut_add_contact">
<intent
diff --git a/src/com/android/contacts/CallUtil.java b/src/com/android/contacts/CallUtil.java
index ddde01c..7172766 100644
--- a/src/com/android/contacts/CallUtil.java
+++ b/src/com/android/contacts/CallUtil.java
@@ -23,6 +23,7 @@
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telecom.VideoProfile;
+import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import com.android.contacts.compat.CompatUtils;
@@ -80,7 +81,17 @@
* automatically.
*/
public static Intent getCallIntent(String number) {
- return getCallIntent(getCallUri(number));
+ Uri uri = getCallUri(number);
+ return PhoneNumberUtils.isEmergencyNumber(number)
+ ? getCallIntentForEmergencyNumber(uri) : getCallIntent(uri);
+ }
+
+ /**
+ * Return an Intent to directly start Dialer when calling an emergency number. Scheme is always
+ * PhoneAccount.SCHEME_TEL.
+ */
+ private static Intent getCallIntentForEmergencyNumber(Uri uri) {
+ return new Intent(Intent.ACTION_DIAL, uri);
}
/**
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index e287e4a..fc0d05a 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -16,6 +16,7 @@
package com.android.contacts;
import android.annotation.TargetApi;
+import android.app.ActivityManager;
import android.app.job.JobInfo;
import android.app.job.JobParameters;
import android.app.job.JobScheduler;
@@ -51,6 +52,7 @@
import com.android.contacts.activities.RequestPermissionsActivity;
import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.lettertiles.LetterTileDrawable;
import com.android.contacts.util.BitmapUtil;
import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.util.PermissionsUtil;
@@ -95,21 +97,18 @@
private static final int SHORTCUT_TYPE_CONTACT_URI = 1;
private static final int SHORTCUT_TYPE_ACTION_URI = 2;
- // The spec specifies that it should be 44dp @ xxxhdpi
- // Note that ShortcutManager.getIconMaxWidth and ShortcutManager.getMaxHeight return different
- // (larger) values.
- private static final int RECOMMENDED_ICON_PIXEL_LENGTH = 176;
-
@VisibleForTesting
static final String[] PROJECTION = new String[] {
Contacts._ID, Contacts.LOOKUP_KEY, Contacts.DISPLAY_NAME_PRIMARY
};
private final Context mContext;
+
private final ContentResolver mContentResolver;
private final ShortcutManager mShortcutManager;
private int mShortLabelMaxLength = SHORT_LABEL_MAX_LENGTH;
private int mLongLabelMaxLength = LONG_LABEL_MAX_LENGTH;
+ private int mIconSize;
private final int mContentChangeMinUpdateDelay;
private final int mContentChangeMaxUpdateDelay;
private final JobScheduler mJobScheduler;
@@ -131,6 +130,12 @@
.getInteger(Experiments.DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
mContentChangeMaxUpdateDelay = Flags.getInstance()
.getInteger(Experiments.DYNAMIC_MAX_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
+ final ActivityManager am = (ActivityManager) context
+ .getSystemService(Context.ACTIVITY_SERVICE);
+ mIconSize = context.getResources().getDimensionPixelSize(R.dimen.shortcut_icon_size);
+ if (mIconSize == 0) {
+ mIconSize = am.getLauncherLargeIconSize();
+ }
}
@VisibleForTesting
@@ -373,10 +378,8 @@
final int iconMaxHeight = mShortcutManager.getIconMaxHeight();
final int sampleSize = Math.min(
- BitmapUtil.findOptimalSampleSize(sourceWidth,
- RECOMMENDED_ICON_PIXEL_LENGTH),
- BitmapUtil.findOptimalSampleSize(sourceHeight,
- RECOMMENDED_ICON_PIXEL_LENGTH));
+ BitmapUtil.findOptimalSampleSize(sourceWidth, mIconSize),
+ BitmapUtil.findOptimalSampleSize(sourceHeight, mIconSize));
final BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inSampleSize = sampleSize;
@@ -404,46 +407,26 @@
return BitmapUtil.getRoundedBitmap(bitmap, targetSize, targetSize);
}
- // If on O or higher, add padding around the bitmap.
- final int paddingW = (int) (bitmap.getWidth() *
- AdaptiveIconDrawable.getExtraInsetFraction());
- final int paddingH = (int) (bitmap.getHeight() *
- AdaptiveIconDrawable.getExtraInsetFraction());
-
- final Bitmap scaledBitmap = Bitmap.createBitmap(bitmap.getWidth() + paddingW,
- bitmap.getHeight() + paddingH, bitmap.getConfig());
-
- final Canvas scaledCanvas = new Canvas(scaledBitmap);
- scaledCanvas.drawBitmap(bitmap, paddingW / 2, paddingH / 2, null);
-
- return scaledBitmap;
+ return bitmap;
}
private Bitmap getFallbackAvatar(String displayName, String lookupKey) {
- final int width;
- final int height;
- final int padding;
- if (BuildCompat.isAtLeastO()) {
- // Add padding on >= O
- padding = (int) (RECOMMENDED_ICON_PIXEL_LENGTH *
- AdaptiveIconDrawable.getExtraInsetFraction());
- width = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
- height = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
- } else {
- padding = 0;
- width = RECOMMENDED_ICON_PIXEL_LENGTH;
- height = RECOMMENDED_ICON_PIXEL_LENGTH;
- }
+ // Use a circular icon if we're not on O or higher.
+ final boolean circularIcon = !BuildCompat.isAtLeastO();
final ContactPhotoManager.DefaultImageRequest request =
- new ContactPhotoManager.DefaultImageRequest(displayName, lookupKey, true);
+ new ContactPhotoManager.DefaultImageRequest(displayName, lookupKey, circularIcon);
+ if (BuildCompat.isAtLeastO()) {
+ // On O, scale the image down to add the padding needed by AdaptiveIcons.
+ request.scale = LetterTileDrawable.getAdaptiveIconScale();
+ }
final Drawable avatar = ContactPhotoManager.getDefaultAvatarDrawableForContact(
mContext.getResources(), true, request);
- final Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ final Bitmap result = Bitmap.createBitmap(mIconSize, mIconSize, Bitmap.Config.ARGB_8888);
// The avatar won't draw unless it thinks it is visible
avatar.setVisible(true, true);
final Canvas canvas = new Canvas(result);
- avatar.setBounds(padding, padding, width - padding, height - padding);
+ avatar.setBounds(0, 0, mIconSize, mIconSize);
avatar.draw(canvas);
return result;
}
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/ShortcutIntentBuilder.java b/src/com/android/contacts/ShortcutIntentBuilder.java
index 3a0b36b..e90e786 100644
--- a/src/com/android/contacts/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/ShortcutIntentBuilder.java
@@ -40,6 +40,7 @@
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
+import android.support.v4.graphics.drawable.IconCompat;
import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
import android.support.v4.os.BuildCompat;
@@ -49,6 +50,7 @@
import android.text.TextUtils.TruncateAt;
import com.android.contacts.ContactPhotoManager.DefaultImageRequest;
+import com.android.contacts.lettertiles.LetterTileDrawable;
import com.android.contacts.util.BitmapUtil;
import com.android.contacts.util.ImplicitIntentsUtil;
@@ -260,8 +262,14 @@
Bitmap bitmap = BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length, null);
return new BitmapDrawable(mContext.getResources(), bitmap);
} else {
+ final DefaultImageRequest request = new DefaultImageRequest(displayName, lookupKey,
+ false);
+ if (BuildCompat.isAtLeastO()) {
+ // On O, scale the image down to add the padding needed by AdaptiveIcons.
+ request.scale = LetterTileDrawable.getAdaptiveIconScale();
+ }
return ContactPhotoManager.getDefaultAvatarDrawableForContact(mContext.getResources(),
- false, new DefaultImageRequest(displayName, lookupKey, false));
+ false, request);
}
}
@@ -285,11 +293,15 @@
final Intent shortcutIntent = ImplicitIntentsUtil.getIntentForQuickContactLauncherShortcut(
mContext, contactUri);
- final Bitmap icon = generateQuickContactIcon(drawable);
-
-
intent = intent == null ? new Intent() : intent;
- intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+
+ final Bitmap icon = generateQuickContactIcon(drawable);
+ if (BuildCompat.isAtLeastO()) {
+ final IconCompat compatIcon = IconCompat.createWithAdaptiveBitmap(icon);
+ compatIcon.addToShortcutIntent(intent);
+ } else {
+ intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ }
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, displayName);
@@ -325,18 +337,25 @@
shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Intent intent = null;
+ IconCompat compatAdaptiveIcon = null;
if (BuildCompat.isAtLeastO()) {
+ compatAdaptiveIcon = IconCompat.createWithAdaptiveBitmap(icon);
final ShortcutManager sm = (ShortcutManager)
mContext.getSystemService(Context.SHORTCUT_SERVICE);
final String id = shortcutAction + lookupKey;
final DynamicShortcuts dynamicShortcuts = new DynamicShortcuts(mContext);
final ShortcutInfo shortcutInfo = dynamicShortcuts.getActionShortcutInfo(
- id, displayName, shortcutIntent, Icon.createWithAdaptiveBitmap(icon));
+ id, displayName, shortcutIntent, compatAdaptiveIcon.toIcon());
intent = sm.createShortcutResultIntent(shortcutInfo);
}
intent = intent == null ? new Intent() : intent;
- intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ // This will be non-null in O and above.
+ if (compatAdaptiveIcon != null) {
+ compatAdaptiveIcon.addToShortcutIntent(intent);
+ } else {
+ intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ }
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, shortcutName);
@@ -344,7 +363,6 @@
}
private Bitmap generateQuickContactIcon(Drawable photo) {
-
// Setup the drawing classes
Bitmap bitmap = Bitmap.createBitmap(mIconSize, mIconSize, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
@@ -354,6 +372,11 @@
photo.setBounds(dst);
photo.draw(canvas);
+ // Don't put a rounded border on an icon for O
+ if (BuildCompat.isAtLeastO()) {
+ return bitmap;
+ }
+
// Draw the icon with a rounded border
RoundedBitmapDrawable roundedDrawable =
RoundedBitmapDrawableFactory.create(mResources, bitmap);
@@ -421,22 +444,24 @@
// Draw the phone action icon as an overlay
int iconWidth = icon.getWidth();
- dst.set(iconWidth - ((int) (20 * density)), -1,
- iconWidth, ((int) (19 * density)));
- canvas.drawBitmap(phoneIcon, null, dst, photoPaint);
-
- canvas.setBitmap(null);
- if (!BuildCompat.isAtLeastO()) {
- return icon;
+ if (BuildCompat.isAtLeastO()) {
+ // On O we need to calculate where the phone icon goes slightly differently. The whole
+ // canvas area is 108dp, a centered circle with a diameter of 66dp is the "safe zone".
+ // So we start the drawing the phone icon at
+ // 108dp - 21 dp (distance from right edge of safe zone to the edge of the canvas)
+ // - 24 dp (size of the phone icon) on the x axis (left)
+ // The y axis is simply 21dp for the distance to the safe zone (top).
+ // See go/o-icons-eng for more details and a handy picture.
+ final int left = (int) (mIconSize - (45 * density));
+ final int top = (int) (21 * density);
+ canvas.drawBitmap(phoneIcon, left, top, photoPaint);
+ } else {
+ dst.set(iconWidth - ((int) (20 * density)), -1,
+ iconWidth, ((int) (19 * density)));
+ canvas.drawBitmap(phoneIcon, null, dst, photoPaint);
}
- // On >= O scale image up by AdaptiveIconDrawable.DEFAULT_VIEW_PORT_SCALE.
- final int scale = (int) (icon.getHeight() *
- (1f / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction())));
- final Bitmap scaledBitmap = Bitmap.createBitmap(icon.getWidth() + scale,
- icon.getHeight() + scale, icon.getConfig());
- Canvas scaledCanvas = new Canvas(scaledBitmap);
- scaledCanvas.drawBitmap(icon, scale / 2, scale / 2, null);
- return scaledBitmap;
+ canvas.setBitmap(null);
+ return icon;
}
}
diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index 82eed24..de04af9 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -78,21 +78,6 @@
/**
* @param context The context the dialog is to run in.
* @param callBack How the parent is notified that the date is set.
- * @param year The initial year of the dialog
- * @param monthOfYear The initial month of the dialog.
- * @param dayOfMonth The initial day of the dialog.
- */
- public DatePickerDialog(Context context,
- OnDateSetListener callBack,
- int year,
- int monthOfYear,
- int dayOfMonth) {
- this(context, callBack, year, monthOfYear, dayOfMonth, false);
- }
-
- /**
- * @param context The context the dialog is to run in.
- * @param callBack How the parent is notified that the date is set.
* @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no year
* has been specified
* @param monthOfYear The initial month of the dialog.
@@ -106,7 +91,7 @@
int dayOfMonth,
boolean yearOptional) {
// Don't pass a theme id. Instead use the default alert dialog theme.
- this(context, /* themeId = */ -1, callBack, year, monthOfYear, dayOfMonth,
+ this(context, /* themeId = */ 0, callBack, year, monthOfYear, dayOfMonth,
yearOptional);
}
@@ -114,24 +99,6 @@
* @param context The context the dialog is to run in.
* @param theme the theme to apply to this dialog
* @param callBack How the parent is notified that the date is set.
- * @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no year
- * has been specified
- * @param monthOfYear The initial month of the dialog.
- * @param dayOfMonth The initial day of the dialog.
- */
- public DatePickerDialog(Context context,
- int theme,
- OnDateSetListener callBack,
- int year,
- int monthOfYear,
- int dayOfMonth) {
- this(context, theme, callBack, year, monthOfYear, dayOfMonth, false);
- }
-
- /**
- * @param context The context the dialog is to run in.
- * @param theme the theme to apply to this dialog
- * @param callBack How the parent is notified that the date is set.
* @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no
* year has been specified.
* @param monthOfYear The initial month of the dialog.
@@ -183,13 +150,6 @@
updateTitle(year, month, day);
}
- public void updateDate(int year, int monthOfYear, int dayOfMonth) {
- mInitialYear = year;
- mInitialMonth = monthOfYear;
- mInitialDay = dayOfMonth;
- mDatePicker.updateDate(year, monthOfYear, dayOfMonth);
- }
-
private void updateTitle(int year, int month, int day) {
final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.YEAR, year);
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 963c125..ef5df1b 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -33,6 +33,7 @@
import com.android.contacts.model.account.AccountDisplayInfo;
import com.android.contacts.model.account.AccountDisplayInfoFactory;
import com.android.contacts.util.SharedPreferenceUtil;
+import com.android.contactsbind.HelpUtils;
import com.android.contactsbind.ObjectFactory;
import java.util.ArrayList;
@@ -118,8 +119,10 @@
mMiscItems.add(new DividerItem());
mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,
R.drawable.quantum_ic_settings_vd_theme_24));
- mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
- R.drawable.quantum_ic_help_vd_theme_24));
+ if (HelpUtils.isHelpAndFeedbackAvailable()) {
+ mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
+ R.drawable.quantum_ic_help_vd_theme_24));
+ }
rebuildItemsList();
}
diff --git a/src/com/android/contacts/drawer/DrawerFragment.java b/src/com/android/contacts/drawer/DrawerFragment.java
index 0aaa262..854f0e6 100644
--- a/src/com/android/contacts/drawer/DrawerFragment.java
+++ b/src/com/android/contacts/drawer/DrawerFragment.java
@@ -123,6 +123,12 @@
return;
}
mGroupListItems.clear();
+ // Initialize cursor's position. If Activity relaunched by orientation change,
+ // only onLoadFinished is called. OnCreateLoader is not called.
+ // The cursor's position is remain end position by moveToNext when the last
+ // onLoadFinished was called.
+ // Therefore, if cursor position was not initialized mGroupListItems is empty.
+ data.moveToPosition(-1);
for (int i = 0; i < data.getCount(); i++) {
if (data.moveToNext()) {
mGroupListItems.add(GroupUtil.getGroupListItem(data, i));
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index ccb3ff9..a250b4e 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -749,6 +749,9 @@
});
}
+ final MenuItem helpMenu = menu.findItem(R.id.menu_help);
+ helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
+
int size = menu.size();
for (int i = 0; i < size; i++) {
menu.getItem(i).setEnabled(mEnabled);
diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index e43d02b..772bc16 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -179,7 +179,8 @@
if (uri == null) {
throw new IllegalArgumentException("Uri must not be null");
}
- if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString())) {
+ if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString()) &&
+ !uri.toString().equals(Profile.CONTENT_URI.toString())) {
throw new IllegalArgumentException("Invalid contact Uri: " + uri);
}
return uri;
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index 80d184b..853b8fc 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -233,7 +233,12 @@
dismiss();
return;
}
- final String name = getGroupName();
+ String name = getGroupName();
+ // Trim group name, when group is saved.
+ // When "Group" exists, do not save " Group ". This behavior is the same as Google Contacts.
+ if (!TextUtils.isEmpty(name)) {
+ name = name.trim();
+ }
// Note we don't check if the loader finished populating mExistingGroups. It's not the
// end of the world if the user ends up with a duplicate group and in practice it should
// never really happen (the query should complete much sooner than the user can edit the
@@ -283,8 +288,19 @@
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
mExistingGroups = new HashSet<>();
final GroupUtil.GroupsProjection projection = new GroupUtil.GroupsProjection(data);
+ // Initialize cursor's position. If Activity relaunched by orientation change,
+ // only onLoadFinished is called. OnCreateLoader is not called.
+ // The cursor's position is remain end position by moveToNext when the last onLoadFinished
+ // was called. Therefore, if cursor position was not initialized mExistingGroups is empty.
+ data.moveToPosition(-1);
while (data.moveToNext()) {
- final String title = projection.getTitle(data);
+ String title = projection.getTitle(data);
+ // Trim existing group name.
+ // When " Group " exists, do not save "Group".
+ // This behavior is the same as Google Contacts.
+ if (!TextUtils.isEmpty(title)) {
+ title = title.trim();
+ }
// Empty system groups aren't shown in the nav drawer so it would be confusing to tell
// the user that they already exist. Instead we allow them to create a duplicate
// group in this case. This is how the web handles this case as well (it creates a
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 367ae2f..5d27086 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -26,6 +26,8 @@
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
+import android.support.v4.text.BidiFormatter;
+import android.support.v4.text.TextDirectionHeuristicsCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -69,6 +71,8 @@
private Future<List<AccountInfo>> mAccountsFuture;
+ private static BidiFormatter sBidiFormatter = BidiFormatter.getInstance();
+
/** Preferred way to show this dialog */
public static void show(FragmentManager fragmentManager) {
final ImportDialogFragment fragment = new ImportDialogFragment();
@@ -160,7 +164,9 @@
phone = sim.getPhone();
}
if (phone != null) {
- phone = PhoneNumberUtilsCompat.createTtsSpannable(phone);
+ phone = sBidiFormatter.unicodeWrap(
+ PhoneNumberUtilsCompat.createTtsSpannable(phone),
+ TextDirectionHeuristicsCompat.LTR);
}
if (count != -1 && phone != null) {
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
index 5652ac6..b80fd4f 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -26,6 +26,7 @@
import android.graphics.Paint.Align;
import android.graphics.Rect;
import android.graphics.Typeface;
+import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
@@ -284,4 +285,11 @@
mIsCircle = isCircle;
return this;
}
+
+ /**
+ * Returns the scale percentage as a float for LetterTileDrawables used in AdaptiveIcons.
+ */
+ public static float getAdaptiveIconScale() {
+ return 1 / (1 + (2 * AdaptiveIconDrawable.getExtraInsetFraction()));
+ }
}
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 4f42a0f..385aa7c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -588,7 +588,8 @@
// Calculate height including padding.
int height = (mNameTextViewHeight + mPhoneticNameTextViewHeight +
mLabelAndDataViewMaxHeight +
- mSnippetTextViewHeight + mStatusTextViewHeight);
+ mSnippetTextViewHeight + mStatusTextViewHeight
+ + getPaddingBottom() + getPaddingTop());
// Make sure the height is at least as high as the photo
height = Math.max(height, mPhotoViewHeight + getPaddingBottom() + getPaddingTop());
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/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 2d83bf1..1c7469f 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -20,6 +20,7 @@
import android.database.Cursor;
import android.os.Bundle;
import android.preference.PreferenceActivity;
+import android.provider.ContactsContract.DisplayNameSources;
import android.provider.ContactsContract.ProviderStatus;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
@@ -202,17 +203,19 @@
boolean hasProfile = false;
String displayName = null;
long contactId = -1;
+ int displayNameSource = DisplayNameSources.UNDEFINED;
if (cursor != null && cursor.moveToFirst()) {
hasProfile = cursor.getInt(ProfileQuery.CONTACT_IS_USER_PROFILE) == 1;
displayName = cursor.getString(ProfileQuery.CONTACT_DISPLAY_NAME);
contactId = cursor.getLong(ProfileQuery.CONTACT_ID);
+ displayNameSource = cursor.getInt(ProfileQuery.DISPLAY_NAME_SOURCE);
}
if (hasProfile && TextUtils.isEmpty(displayName)) {
displayName = getString(R.string.missing_name);
}
final DisplayOptionsPreferenceFragment fragment = (DisplayOptionsPreferenceFragment)
getFragmentManager().findFragmentByTag(TAG_DISPLAY_OPTIONS);
- fragment.updateMyInfoPreference(hasProfile, displayName, contactId);
+ fragment.updateMyInfoPreference(hasProfile, displayName, contactId, displayNameSource);
}
@Override
diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 22a6683..82e90b3 100644
--- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -33,11 +33,14 @@
import android.preference.PreferenceFragment;
import android.provider.BlockedNumberContract;
import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.DisplayNameSources;
import android.provider.ContactsContract.Profile;
import android.support.design.widget.Snackbar;
import android.support.v4.content.LocalBroadcastManager;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -111,17 +114,20 @@
Contacts._ID, // 0
Contacts.DISPLAY_NAME_PRIMARY, // 1
Contacts.IS_USER_PROFILE, // 2
+ Contacts.DISPLAY_NAME_SOURCE, // 3
};
private static final String[] PROFILE_PROJECTION_ALTERNATIVE = new String[] {
Contacts._ID, // 0
Contacts.DISPLAY_NAME_ALTERNATIVE, // 1
Contacts.IS_USER_PROFILE, // 2
+ Contacts.DISPLAY_NAME_SOURCE, // 3
};
public static final int CONTACT_ID = 0;
public static final int CONTACT_DISPLAY_NAME = 1;
public static final int CONTACT_IS_USER_PROFILE = 2;
+ public static final int DISPLAY_NAME_SOURCE = 3;
}
private String mNewLocalProfileExtra;
@@ -255,8 +261,13 @@
mRootView = null;
}
- public void updateMyInfoPreference(boolean hasProfile, String displayName, long contactId) {
- final CharSequence summary = hasProfile ? displayName : getString(R.string.set_up_profile);
+ public void updateMyInfoPreference(boolean hasProfile, String displayName, long contactId,
+ int displayNameSource) {
+ final CharSequence summary = !hasProfile ?
+ getString(R.string.set_up_profile) :
+ displayNameSource == DisplayNameSources.PHONE ?
+ BidiFormatter.getInstance().unicodeWrap(displayName, TextDirectionHeuristics.LTR) :
+ displayName;
mMyInfoPreference.setSummary(summary);
mHasProfile = hasProfile;
mProfileContactId = contactId;
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 bd419b5..4e308b3 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,10 @@
@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 TACHYON_CALL_ACTION =
+ "com.google.android.apps.tachyon.action.CALL";
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";
@@ -430,8 +436,6 @@
}
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
mHasIntentLaunched = true;
try {
final int actionType = intent.getIntExtra(EXTRA_ACTION_TYPE,
@@ -439,7 +443,15 @@
final String thirdPartyAction = intent.getStringExtra(EXTRA_THIRD_PARTY_ACTION);
Logger.logQuickContactEvent(mReferrer, mContactType,
CardType.UNKNOWN_CARD, actionType, thirdPartyAction);
- ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this, intent);
+ // For the tachyon call action, we need to use startActivityForResult and not
+ // add FLAG_ACTIVITY_NEW_TASK to the intent.
+ if (TACHYON_CALL_ACTION.equals(intent.getAction())) {
+ QuickContactActivity.this.startActivityForResult(intent, /* requestCode */ 0);
+ } else {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this,
+ intent);
+ }
} catch (SecurityException ex) {
Toast.makeText(QuickContactActivity.this, R.string.missing_app,
Toast.LENGTH_SHORT).show();
@@ -1021,8 +1033,6 @@
mCachedCp2DataCardModel = null;
}
mContactLoader.forceLoad();
-
- NfcHandler.register(this, mLookupUri);
}
private void destroyInteractionLoaders() {
@@ -1145,6 +1155,7 @@
}
};
mEntriesAndActionsTask.execute();
+ NfcHandler.register(this, mContactData.getLookupUri());
}
private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {
@@ -1158,6 +1169,8 @@
final List<DataItem> sipCallDataItems = dataItemsMap.get(SipAddress.CONTENT_ITEM_TYPE);
if (phoneDataItems != null && phoneDataItems.size() == 1) {
mOnlyOnePhoneNumber = true;
+ } else {
+ mOnlyOnePhoneNumber = false;
}
String[] phoneNumbers = null;
if (phoneDataItems != null) {
@@ -1196,6 +1209,8 @@
final List<DataItem> emailDataItems = dataItemsMap.get(Email.CONTENT_ITEM_TYPE);
if (emailDataItems != null && emailDataItems.size() == 1) {
mOnlyOneEmail = true;
+ } else {
+ mOnlyOneEmail = false;
}
String[] emailAddresses = null;
if (emailDataItems != null) {
@@ -1328,6 +1343,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
/* iconResourceId = */ 0);
List<Entry> phoneticList = new ArrayList<>();
phoneticList.add(phoneticEntry);
@@ -1390,6 +1406,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 +1426,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 +1461,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());
@@ -1451,17 +1468,19 @@
final String mimeType = dataItem.getMimeType();
if (mimeType == null) continue;
- final AccountType accountType = rawContact.getAccountType(this);
- final DataKind dataKind = AccountTypeManager.getInstance(this)
- .getKindOrFallback(accountType, mimeType);
- if (dataKind == null) continue;
+ if (!MIMETYPE_TACHYON.equals(mimeType)) {
+ final AccountType accountType = rawContact.getAccountType(this);
+ final DataKind dataKind = AccountTypeManager.getInstance(this)
+ .getKindOrFallback(accountType, mimeType);
+ if (dataKind == null) continue;
- dataItem.setDataKind(dataKind);
+ dataItem.setDataKind(dataKind);
- final boolean hasData = !TextUtils.isEmpty(dataItem.buildDataString(this,
- dataKind));
+ final boolean hasData = !TextUtils.isEmpty(dataItem.buildDataString(this,
+ dataKind));
- if (isMimeExcluded(mimeType) || !hasData) continue;
+ if (isMimeExcluded(mimeType) || !hasData) continue;
+ }
List<DataItem> dataItemListByType = dataItemsMap.get(mimeType);
if (dataItemListByType == null) {
@@ -1472,6 +1491,7 @@
}
}
Trace.endSection();
+ bindReachability(dataItemsMap);
Trace.beginSection("sort within mimetypes");
/*
@@ -1529,6 +1549,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.
*/
@@ -1575,6 +1617,7 @@
Spannable smsContentDescription = null;
Intent intent = null;
boolean shouldApplyColor = true;
+ boolean shouldApplyThirdIconColor = true;
Drawable alternateIcon = null;
Intent alternateIntent = null;
StringBuilder alternateContentDescription = new StringBuilder();
@@ -1747,6 +1790,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);
@@ -1770,20 +1816,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(TACHYON_CALL_ACTION);
+ thirdIntent.setData(
+ Uri.fromParts(PhoneAccount.SCHEME_TEL, phone.getNumber(), null));
+ thirdContentDescription = ((PhoneDataItem) dataItem).getReachableDataItem()
+ .getContentValues().getAsString(Data.DATA2);
}
}
} else if (dataItem instanceof EmailDataItem) {
@@ -1870,6 +1919,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);
@@ -1882,7 +1935,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
@@ -1964,7 +2016,7 @@
: smsContentDescription,
shouldApplyColor, isEditable,
entryContextMenuInfo, thirdIcon, thirdIntent, thirdContentDescription, thirdAction,
- thirdExtras, iconResourceId);
+ thirdExtras, shouldApplyThirdIconColor, iconResourceId);
}
private List<Entry> dataItemsToEntries(List<DataItem> dataItems,
@@ -2265,6 +2317,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdActionExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
interaction.getIconResourceId()));
}
return entries;
@@ -2497,7 +2550,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>());