Fix regression with editing me profile
am: ba10be290e
Change-Id: Icc2504d0e692c8af953978f3ceab81503bf37909
diff --git a/Android.mk b/Android.mk
index a03d671..c42434f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
endif
src_dirs := src src-bind $(phone_common_dir)/src
-res_dirs := res res-aosp res-icons $(phone_common_dir)/res
+res_dirs := res res-aosp res-bind res-icons $(phone_common_dir)/res
asset_dirs := assets
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/res-bind/layout/navigation_view.xml b/res-bind/layout/navigation_view.xml
new file mode 100644
index 0000000..d553768
--- /dev/null
+++ b/res-bind/layout/navigation_view.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+<android.support.design.widget.NavigationView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/nav_view"
+ android:theme="@style/NavigationDrawerMenuItemTextAppearance"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:fitsSystemWindows="true"
+ android:background="@android:color/white"
+ app:itemBackground="@drawable/drawer_item_background"
+ app:headerLayout="@layout/nav_header_main"
+ app:menu="@menu/activity_main_drawer"/>
diff --git a/res/layout/contacts_drawer_activity.xml b/res/layout/contacts_drawer_activity.xml
index e560494..904a46b 100644
--- a/res/layout/contacts_drawer_activity.xml
+++ b/res/layout/contacts_drawer_activity.xml
@@ -17,7 +17,6 @@
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
@@ -26,40 +25,9 @@
tools:openDrawer="start">
<!-- To prevent hamburger menu from getting the initial focus. -->
- <View
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:layout_width="1px"
- android:layout_height="1px" >
- <requestFocus/>
- </View>
+ <include layout="@layout/dummy_view_for_initial_focus"/>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment_container"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <include layout="@layout/contacts_main_content"/>
- <include
- layout="@layout/people_activity_toolbar"
- android:id="@+id/toolbar_parent" />
-
- <FrameLayout
- android:id="@+id/content_frame"
- android:layout_width="match_parent"
- android:layout_height="fill_parent"
- android:background="?android:attr/windowBackground" />
- </LinearLayout>
-
- <android.support.design.widget.NavigationView
- android:id="@+id/nav_view"
- android:theme="@style/NavigationDrawerMenuItemTextAppearance"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:fitsSystemWindows="true"
- app:itemBackground="@drawable/drawer_item_background"
- app:headerLayout="@layout/nav_header_main"
- app:menu="@menu/activity_main_drawer"/>
-
+ <include layout="@layout/navigation_view"/>
</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/contacts_main_content.xml b/res/layout/contacts_main_content.xml
new file mode 100644
index 0000000..748bdbb
--- /dev/null
+++ b/res/layout/contacts_main_content.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fragment_container"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <include
+ layout="@layout/people_activity_toolbar"
+ android:id="@+id/toolbar_parent" />
+
+ <FrameLayout
+ android:id="@+id/content_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/windowBackground" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dummy_view_for_initial_focus.xml b/res/layout/dummy_view_for_initial_focus.xml
new file mode 100644
index 0000000..3876e98
--- /dev/null
+++ b/res/layout/dummy_view_for_initial_focus.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<View
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:layout_width="1px"
+ android:layout_height="1px" >
+ <requestFocus/>
+</View>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6d0e895..b1e9909 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Kies \'n verstekrekening vir nuwe kontakte:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Voeg nuwe kontak by"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Wysig kontak"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Voeg rekening by"</string>
<string name="add_new_account" msgid="5748627740680940264">"Voeg nuwe rekening by"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Voer databasislêers uit"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7322913..dd26dac 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"ለአዲስ እውቂያዎች ነባሪ መለያን ይምረጡ፦"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"አዲስ እውቂያ ያክሉ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"እውቂያ ያርትዑ"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"መለያ አክል"</string>
<string name="add_new_account" msgid="5748627740680940264">"አዲስ መለያ አክል"</string>
<string name="menu_export_database" msgid="2659719297530170820">"የውሂብ ጎታ ፋይሎችን ወደ ውጭ ላክ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 660de29..1ad4abf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -269,10 +269,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"اختيار حساب افتراضي لجهات الاتصال الجديدة:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"إضافة جهة اتصال جديدة"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"تعديل جهة الاتصال"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"إضافة حساب"</string>
<string name="add_new_account" msgid="5748627740680940264">"إضافة حساب جديد"</string>
<string name="menu_export_database" msgid="2659719297530170820">"تصدير ملفات قاعدة البيانات"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 480896e..c75835f 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Yeni kontaktlar üçün defolt hesab seçin:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Yeni kontakt əlavə edin"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Kontakta düzəliş edin"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Hesab əlavə edin"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yeni hesab əlavə edin"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Data baza fayllarını eksport edin"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2e52327..f41f959 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Изберете стандартен профил за новите контакти:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Добавяне"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Редактиране"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Добавяне"</string>
<string name="add_new_account" msgid="5748627740680940264">"Добавяне на нов профил"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Експортиране на файловете на базата от данни"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index ee845d4..08a44b0 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"নতুন পরিচিতিগুলির জন্য একটি ডিফল্ট অ্যাকাউন্ট বেছে নিন:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"নতুন পরিচিতি জুড়ুন"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"পরিচিতি সম্পাদনা করুন"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"অ্যাকাউন্ট জুড়ুন"</string>
<string name="add_new_account" msgid="5748627740680940264">"নতুন অ্যাকাউন্ট যোগ করুন"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ডেটাবেস ফাইলগুলি রপ্তানি করুন"</string>
@@ -285,10 +281,10 @@
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"আপনি যখন ইমেল বা ফোন নম্বর লেখার ক্ষেত্রটিতে ব্যক্তির Hangouts সনাক্তকারী লেখেন তখন Hangouts আরো ভালো কাজ করে৷"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"আরো ফিল্ড"</string>
<string name="editor_change_photo_content_description" msgid="754100561085306263">"ফটো পরিবর্তন করুন"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"সম্পাদক খোলা গেল না৷"</string>
+ <string name="editor_failed_to_load" msgid="1623639078580475818">"সম্পাদক খুলতে ব্যর্থ হচ্ছে৷"</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"এতে সংরক্ষণ করা হচ্ছে"</string>
<string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"দেখা হচ্ছে"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"বর্তমানে <xliff:g id="ACCOUNT_NAME">%s</xliff:g> এ সংরক্ষণ করা হচ্ছে৷ কোনো আলাদা অ্যাকাউন্ট চয়ন করার জন্য দুবার আলতো চাপুন৷"</string>
+ <string name="editor_account_selector_description" msgid="3324358600570627740">"বর্তমানে <xliff:g id="ACCOUNT_NAME">%s</xliff:g> এ সংরক্ষণ করা হচ্ছে৷ কোনো আলাদা অ্যাকাউন্ট চয়ন করার জন্য দুবার আলতো চপুন৷"</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
<item quantity="one">লিঙ্ক করা পরিচিতিগুলি (<xliff:g id="COUNT">%d</xliff:g>টি)</item>
<item quantity="other">লিঙ্ক করা পরিচিতিগুলি (<xliff:g id="COUNT">%d</xliff:g>টি)</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5c4582d..540b13a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Tria un compte predeterminat per als contactes nous:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Afegeix un contacte"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edita el contacte"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Afegeix compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Afegeix compte"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporta els fitxers de la base de dades"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ac4a663..08b1325 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Zvolte výchozí účet pro nové kontakty:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Přidat nový kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Upravit kontakt"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Přidat účet"</string>
<string name="add_new_account" msgid="5748627740680940264">"Přidat nový účet"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportovat soubory databáze"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 87dbd94..52acd85 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Vælg en standardkonto til nye kontaktpersoner:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Tilføj ny kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Rediger kontaktperson"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Tilføj konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tilføj ny konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportér databasefiler"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fcbd3ec..2565045 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Wähle ein Standardkonto für neue Kontakte:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Kontakt hinzufügen"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Kontakt bearbeiten"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Konto hinzufügen"</string>
<string name="add_new_account" msgid="5748627740680940264">"Neues Konto hinzufügen"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Datenbankdateien exportieren"</string>
@@ -287,7 +283,7 @@
<string name="editor_change_photo_content_description" msgid="754100561085306263">"Foto ändern"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"Fehler beim Öffnen des Editors."</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"Speichern in"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Anzeige von"</string>
+ <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Wiedergabe"</string>
<string name="editor_account_selector_description" msgid="3324358600570627740">"Wird derzeit in <xliff:g id="ACCOUNT_NAME">%s</xliff:g> gespeichert. Doppeltippe, um ein anderes Konto auszuwählen."</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
<item quantity="other">Verknüpfte Kontakte (<xliff:g id="COUNT">%d</xliff:g>)</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1ea55fa..dff1668 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Επιλέξτε έναν προεπιλεγμένο λογαριασμό για νέες επαφές:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Προσθήκη νεάς επαφής"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Επεξεργασία επαφής"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Προσθήκη λογαριασμού"</string>
<string name="add_new_account" msgid="5748627740680940264">"Προσθήκη νέου λογαριασμού"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Εξαγωγή αρχείων βάσης δεδομένων"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5084c8c..1dd7ee2 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Choose a default account for new contacts:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Add new contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit contact"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Add account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5084c8c..1dd7ee2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Choose a default account for new contacts:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Add new contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit contact"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Add account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5084c8c..1dd7ee2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Choose a default account for new contacts:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Add new contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit contact"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Add account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8d5d1b8..3bb2479 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Elige una cuenta predeterminada para los contactos nuevos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Agregar contacto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Agregar una cuenta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Agregar cuenta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar archivos de base de datos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cbd7fcd..5c84cc7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Selecciona una cuenta predeterminada para los contactos nuevos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Añadir contacto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Añadir cuenta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Añadir cuenta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar archivos de base de datos"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"llamada reciente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. haz clic para devolver la llamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Tú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mejor si se introduce el identificador de Hangouts de la persona en el campo del correo electrónico o en el campo del teléfono."</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Más campos"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"Cambiar foto"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"No se ha podido abrir el editor."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"Se guarda en"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Viendo"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"Actualmente los contactos se guardan en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Toca dos veces para seleccionar otra cuenta."</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="other">Contactos enlazados (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="one">Contacto enlazado</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contactos enlazados"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"VINCULAR CONTACTOS"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contacto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Posibles duplicados"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Es posible que estos contactos se correspondan a la misma persona. Puedes enlazarlos y crear un único contacto."</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"Contactos enlazados"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"De tus cuentas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Elegir foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0961ee1..bcdf146 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Valige uute kontaktide jaoks vaikekonto:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Kontakti lisamine"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Kontakti muutmine"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Lisa konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisa uus konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Andmebaasi failide eksportimine"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 8f4ae72..c04b292 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Aukeratu kontaktu berriak gordetzeko erabili nahi duzun kontua:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Gehitu kontaktu berria"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editatu kontaktua"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Gehitu kontua"</string>
<string name="add_new_account" msgid="5748627740680940264">"Gehitu beste kontu bat"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Esportatu datu-baseko fitxategiak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f0950c9..3c49f2e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"انتخاب حساب پیشفرض برای مخاطبین جدید:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"افزودن مخاطب جدید"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"ویرایش مخاطب"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"افزودن حساب"</string>
<string name="add_new_account" msgid="5748627740680940264">"افزودن حساب جدید"</string>
<string name="menu_export_database" msgid="2659719297530170820">"صدور فایلهای پایگاه داده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5ca97e7..53d6c2f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Valitse uusien yhteystietojen oletustili:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Lisää yhteystieto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Muokkaa yhteystietoa"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Lisää tili"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisää uusi tili"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Vie tietokantatiedostot"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6fe82cb..bc93005 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Choisissez un compte par défaut pour les nouveaux contacts :"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Ajouter un contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Modifier un contact"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Ajouter un compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ajouter un nouveau compte"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporter les fichiers de la base de données"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 932c925..4088791 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Sélectionnez un compte par défaut pour les nouveaux contacts :"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Ajouter un contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Modifier contact"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Ajouter un compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ajouter un compte"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporter les fichiers de la base de données"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Appuyez sur l\'écran pour rappeler ce numéro."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Les Hangouts fonctionnent mieux si vous saisissez l\'identifiant Hangouts de la personne concernée dans le champ de l\'adresse e-mail ou du numéro de téléphone."</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Autres champs"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"Changer de photo"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"Échec de l\'ouverture de l\'éditeur."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"Enregistrement sur le compte"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"En cours de consultation"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"Enregistrement en cours sur le compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Appuyez deux fois pour choisir un autre compte."</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="one">Contact associé (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="other">Contacts associés (<xliff:g id="COUNT">%d</xliff:g>)</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contacts associés"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ASSOCIER LES CONTACTS"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ce contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Doublons potentiels"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ces contacts correspondent peut-être à la même personne. Vous pouvez les regrouper dans un seul contact."</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"Contacts associés"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"De vos comptes"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Sélectionner une photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Du compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 80b5588..3cefdaf 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Escolle unha conta predeterminada para novos contactos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Engadir contacto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Engadir conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Engadir conta nova"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar ficheiros da base de datos"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index d019942..718a986 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"નવા સંપર્કો માટે એક ડીફોલ્ટ એકાઉન્ટ પસંદ કરો:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"નવો સંપર્ક ઉમેરો"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"સંપર્ક સંપાદિત કરો"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"એકાઉન્ટ ઉમેરો"</string>
<string name="add_new_account" msgid="5748627740680940264">"નવું એકાઉન્ટ ઉમેરો"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ડેટાબેસ ફાઇલોનો નિકાસ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d996bbd..46499fa 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"नए संपर्कों के लिए डिफ़ॉल्ट खाता चुनें:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"नया संपर्क जोड़ें"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"संपर्क संपादित करें"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"खाता जोड़ें"</string>
<string name="add_new_account" msgid="5748627740680940264">"नया खाता जोड़ें"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फ़ाइलें निर्यात करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 600985a..f843015 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -248,10 +248,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Odaberite zadani račun za nove kontakte:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj novi kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Uredi kontakt"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Dodaj račun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj novi račun"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvezi datoteke podatkovne baze"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4578edc..8aa7f27 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Válasszon ki egy alapértelmezett fiókot az új névjegyek számára"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Névjegy hozzáadása"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Névjegy szerkesztése"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Fiók megadása"</string>
<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>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 4036686..ca585b9 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Ընտրեք կանխադրված հաշիվ նոր կոնտակտների համար՝"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Ավելացնել կոնտակտ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Փոփոխել կոնտակտը"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Ավելացնել հաշիվ"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ավելացնել նոր հաշիվ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Արտահանել տվյալների շտեմարանի ֆայլերը"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"վերջին զանգը՝ <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ հետ զանգելու համար"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Դուք՝ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts-ն ավելի լավ կաշխատի, եթե էլփոստի կամ հեռախոսի դաշտում մուտքագրեք Hangouts-ի օգտվողի նույնացուցիչը:"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Լրացուցիչ դաշտեր"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"Փոխել լուսանկարը"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"Չհաջողվեց բացել խմբագրիչը:"</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"Պահվում է հետևյալ հաշվում՝"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Դիտում"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"Ներկայումս պահվում է <xliff:g id="ACCOUNT_NAME">%s</xliff:g> հաշվում: Կրկնակի հպեք՝ մեկ այլ հաշիվ ընտրելու համար:"</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="one">Linked contacts (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="other">Կցած կոնտակտներ (<xliff:g id="COUNT">%d</xliff:g>)</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> կապված կոնտակտ"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ՄԻԱԿՑԵԼ ԿՈՆՏԱԿՏՆԵՐԸ"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Այս կոնտակտը"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Հնարավոր կրկնօրինակներ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Այս կոնտակտները հնարավոր է միևնույն մարդու կոնտակտներ են։ Կարող եք դրանք միակցել և ստեղծել մեկ կոնտակտ։"</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"Կցած կոնտակտներ"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"Ձեր հաշիվներից"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Ընտրել լուսանկար"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> հաշվից"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2835198..2ab3633 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Pilih akun default untuk kontak baru:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Tambah kontak baru"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit kontak"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Tambahkan akun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tambahkan akun baru"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Ekspor file basis data"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b2e4814..f0a5feb 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Veldu sjálfgefinn reikning fyrir nýja tengiliði:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Bæta tengilið við"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Breyta tengilið"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Bæta reikningi við"</string>
<string name="add_new_account" msgid="5748627740680940264">"Bæta nýjum reikningi við"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Flytja út gagnagrunnsskrár"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6c4e2de..29ec1ad 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Scegli un account predefinito per i nuovi contatti:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Nuovo contatto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Modifica contatto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Aggiungi account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Aggiungi nuovo account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Esporta file database"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 130c881..365d9a0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"בחר חשבון ברירת מחדל לאנשי קשר חדשים:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"הוספת איש קשר חדש"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"ערוך איש קשר"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"הוסף חשבון"</string>
<string name="add_new_account" msgid="5748627740680940264">"הוסף חשבון חדש"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ייצוא קובצי מסד נתונים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bc9f0c2..cb6bec4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"新しい連絡先のデフォルトアカウントを選択してください。"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"新しい連絡先を追加"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"連絡先を編集"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"アカウントを追加"</string>
<string name="add_new_account" msgid="5748627740680940264">"新しいアカウントを追加"</string>
<string name="menu_export_database" msgid="2659719297530170820">"データベースファイルをエクスポート"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index d031a13..24a74d7 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"აირჩიეთ ნაგულისხმევი ანგარიში ახალი კონტაქტებისთვის:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"ახალი კონტაქტ.დამატება"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"კონტაქტის შესწორება"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ანგარიშის დამატება"</string>
<string name="add_new_account" msgid="5748627740680940264">"ახალი ანგარიშის დამატება"</string>
<string name="menu_export_database" msgid="2659719297530170820">"მონაცემთა ბაზის ფაილების ექსპორტი"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5285b56..65a2f00 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Жаңа контактілерге арналған әдепкі есептік жазбаны таңдаңыз:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Жаңа контакт қосу"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Контактіні өңдеу"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Ес. жазба қосу"</string>
<string name="add_new_account" msgid="5748627740680940264">"Жаңа есептік жазба қосу"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Дерекқор файлдарын экспорттау"</string>
@@ -287,7 +283,7 @@
<string name="editor_change_photo_content_description" msgid="754100561085306263">"Суретті өзгерту"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"Өңдегішті ашу мүмкін болмады."</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"Cақтау:"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Қаралуда"</string>
+ <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Каралуда"</string>
<string name="editor_account_selector_description" msgid="3324358600570627740">"Қазір <xliff:g id="ACCOUNT_NAME">%s</xliff:g> есептік жазбасына сақталуда. Басқа есептік жазбаны таңдау үшін, екі рет түртіңіз."</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
<item quantity="other">Байланысты контактілер (<xliff:g id="COUNT">%d</xliff:g>)</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 7fb4857..fedfcbf 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"ជ្រើសគណនីលំនាំដើមសម្រាប់ទំនាក់ទំនងថ្មី៖"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"បញ្ចូលទំនាក់ទំនងថ្មី"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"កែទំនាក់ទំនង"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"បញ្ចូលគណនី"</string>
<string name="add_new_account" msgid="5748627740680940264">"បន្ថែមគណនីថ្មី"</string>
<string name="menu_export_database" msgid="2659719297530170820">"នាំចេញឯកសារមូលដ្ឋានទិន្នន័យ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 2b587d6..5b5238c 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"ಹೊಸ ಸಂಪರ್ಕಗಳಿಗೆ ಡಿಫಾಲ್ಟ್ ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"ಹೊಸ ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"ಸಂಪರ್ಕವನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ಖಾತೆ ಸೇರಿಸಿ"</string>
<string name="add_new_account" msgid="5748627740680940264">"ಹೊಸ ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ಡೇಟಾಬೇಸ್ ಫೈಲ್ಗಳನ್ನು ರಫ್ತು ಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 123d160..b0c2bc6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"새 연락처에 대한 기본 계정 선택:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"새 연락처 추가"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"연락처 수정"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"계정 추가"</string>
<string name="add_new_account" msgid="5748627740680940264">"새 계정 추가"</string>
<string name="menu_export_database" msgid="2659719297530170820">"데이터베이스 파일 내보내기"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index e4378af..f80902d 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Жаңы байланыштар үчүн демейки каттоо эсебин тандаңыз:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Жаңы байланыш кошуу"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Байланышты түзөтүү"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Эсеп кошуу"</string>
<string name="add_new_account" msgid="5748627740680940264">"Жаңы эсеп кошуу"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Берилиштер корлорунун файлдарын экспорттоо"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 5580570..c65ed89 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"ເລືອກບັນຊີເລີ່ມຕົ້ນສຳລັບລາຍຊື່ຕິດຕໍ່ໃໝ່:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"ແກ້ໄຂລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ເພີ່ມບັນຊີ"</string>
<string name="add_new_account" msgid="5748627740680940264">"ເພີ່ມບັນຊີໃໝ່"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ສົ່ງອອກໄຟລ໌ຖານຂໍ້ມູນ"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"ການໂທຫຼ້າສຸດ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ຄລິກເພື່ອໂທກັບ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"ທ່ານ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ເຮັດວຽກໄດ້ດີຂຶ້ນ ເມື່ອທ່ານປ້ອນຕົວລະບຸ Hangouts ຂອງບຸກຄົນໃສ່ບ່ອນໃສ່ອີເມວ ຫຼືບ່ອນໃສ່ໂທລະສັບຂອງທ່ານ."</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"ຊ່ອງຂໍ້ມູນເພີ່ມເຕີມ"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"ປ່ຽນຮູບ"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"ເປີດຕົວຕັດຕໍ່ບໍ່ສຳເລັດ."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"ກຳລັງບັນທຶກໃສ່"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"ກຳລັງເບິ່ງ"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"ຕອນນີ້ກຳລັງບັນທຶກໃສ່ <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. ແຕະສອງເທື່ອເພື່ອເລືອກບັນຊີອື່ນ."</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="other">ລາຍຊື່ຕິດຕໍ່ທີ່ລິ້ງແລ້ວ (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="one">ລາຍຊື່ຕິດຕໍ່ທີ່ລິ້ງແລ້ວ</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> ລາຍຊື່ຕິດຕໍ່ລິ້ງແລ້ວ"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ລິ້ງລາຍຊື່ຕິດຕໍ່"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ລາຍຊື່ຕິດຕໍ່ນີ້"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ເປັນໄປໄດ້ວ່າມີການຊ້ຳກັນ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ລາຍຊື່ຕິດຕໍ່ເຫຼົ່ານີ້ອາດຈະເປັນຄົນດຽວກັນ. ທ່ານສາມາດລິ້ງພວກມັນເຂົ້າກັນເປັນບັນຊີດຽວໄດ້."</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"ລາຍຊື່ຕິດຕໍ່ທີ່ລິ້ງແລ້ວ"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"ຈາກບັນຊີຂອງທ່ານ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ເລືອກຮູບ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"ຈາກ <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3bc5ad4..56bad49 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Pasirinkite numatytąją naujų kontaktų paskyrą:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Pridėti naują kont."</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Redaguoti kontaktą"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Pridėti paskyrą"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pridėkite naują paskyrą"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportuoti duomenų failus"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 333683e..2535cbc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -248,10 +248,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izvēlieties noklusējuma kontu, kurā saglabāt jaunās kontaktpersonas:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Pievienošana"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Rediģēšana"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Pievienot kontu"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pievienot jaunu kontu"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportēt datu bāzes failus"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index ff0371b..6fb161c 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Изберете стандардна сметка за новите контакти:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Додај нов контакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Уреди контакт"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Додај сметка"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додај нова сметка"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Извези датотеки од база на податоци"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 93cd120..7ac2744 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"പുതിയ കോൺടാക്റ്റുകൾക്ക് ഒരു ഡിഫോൾട്ട് അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"പുതിയവ ചേർക്കൂ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"എഡിറ്റുചെയ്യുക"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="add_new_account" msgid="5748627740680940264">"പുതിയ അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ഡാറ്റാബേസ് ഫയലുകൾ എക്സ്പോർട്ടുചെയ്യുക"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index c9c7217..fcb40c0 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Шинэ харилцагчид өгөгдмөл бүртгэл сонгох:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Шинэ харилцагч нэмэх"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Харилцагчийг засварлах"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Бүртгэл нэмэх"</string>
<string name="add_new_account" msgid="5748627740680940264">"Шинэ бүртгэл нэмэх"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Өгөгдлийн сангийн файлуудыг экспорт хийх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 3013ac8..88bc420 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"नवीन संपर्कांसाठी एक डीफॉल्ट खाते निवडा:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"नवीन संपर्क जोडा"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"संपर्क संपादित करा"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"खाते जोडा"</string>
<string name="add_new_account" msgid="5748627740680940264">"नवीन खाते जोडा"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फाईल निर्यात करा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 95495b1..a6cc9ba 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Pilih akaun lalai untuk kenalan baharu:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Tambah kenalan baru"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edit kenalan"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Tambah akaun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tambah akaun baharu"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksport fail pangkalan data"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index ed99fe1..eabb00b 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"အဆက်အသွယ် အသစ်များအတွက် မူရင်းအကောင့်ကို ရွေးပါ။"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"အဆက်အသွယ်သစ် ထည့်မည်"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"အဆက်အသွယ်အားပြင်ရန်"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"အကောင့်ထည့်ရန်"</string>
<string name="add_new_account" msgid="5748627740680940264">"အကောင့်အသစ်ထည့်ပါ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ဒေ့ဘာဘေ့စ်ဖိုင်များကို အပြင်သို့ထုတ်ပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 06460d2..3c3642e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Velg en standardkonto for nye kontakter."</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Legg til ny kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Rediger"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Legg til konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Legg til ny konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksporter databasefilene"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index ccc2176..b594126 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"नयाँ सम्पर्क ठेगानाहरूका लागि पूर्वनिर्धारित खाता छान्नुहोस्:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"नयाँ सम्पर्क थप्ने"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"सम्पर्क सम्पादन"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"खाता थप्नुहोस्"</string>
<string name="add_new_account" msgid="5748627740680940264">"नयाँ खाता थप्नुहोस्"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फाइलहरू निर्यात गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1bb76eb..8dfb402 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Kies een standaardaccount voor nieuwe contacten"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Contact toevoegen"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Contact bewerken"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Account toevoegen"</string>
<string name="add_new_account" msgid="5748627740680940264">"Nieuw account toevoegen"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Databasebestanden exporteren"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 2b44eb5..99d8fa3 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"ਨਵੇਂ ਸੰਪਰਕਾਂ ਲਈ ਇੱਕ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਖਾਤਾ ਚੁਣੋ:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"ਨਵਾਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"ਸੰਪਰਕ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="add_new_account" msgid="5748627740680940264">"ਨਵਾਂ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ਡਾਟਾਬੇਸ ਫਾਈਲਾਂ ਨਿਰਯਾਤ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 12cb175..b017162 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Wybierz domyślne konto dla nowych kontaktów:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj nowy kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edytuj kontakt"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Dodaj konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj nowe konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportuj pliki bazy danych"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1a7d0d5..e202ea5 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Escolha uma conta padrão para novos contatos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adic. novo contato"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contato"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Adicionar conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adicionar nova conta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar arquivos do banco de dados"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 480b5a9..2413369 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Escolha uma conta predefinida para os novos contactos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adicionar novo contacto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Adicionar conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adicionar nova conta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar ficheiros da base de dados"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1a7d0d5..e202ea5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Escolha uma conta padrão para novos contatos:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adic. novo contato"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contato"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Adicionar conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adicionar nova conta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar arquivos do banco de dados"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5e951ff..116f394 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -248,10 +248,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Alegeți un cont prestabilit pentru persoanele de contact noi:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adăugați o persoană"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editați intrarea"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Adăugați un cont"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adăugați un cont nou"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportați fișierele bazei de date"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 913031c..114bf8c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Выберите аккаунт по умолчанию для новых контактов:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Добавить контакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Изменить контакт"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Добавить аккаунт"</string>
<string name="add_new_account" msgid="5748627740680940264">"Добавить аккаунт"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Экспорт файлов базы данных"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 9435b54..b1fc263 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"නව සම්බන්ධතා සඳහා පෙරනිමි ගිණුමක් තෝරන්න:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"නව සම්බන්ධතාව එක් කරන්න"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"සම්බන්ධතාව සංස්කරණය කරන්න"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ගිණුමක් එකතු කරන්න"</string>
<string name="add_new_account" msgid="5748627740680940264">"නව ගිණුමක් එක් කරන්න"</string>
<string name="menu_export_database" msgid="2659719297530170820">"දත්ත සමුදා ගොනු නිර්යාත කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 330f78e..46e69e1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Vyberte predvolený účet pre nové kontakty:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Pridať nový kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Upraviť kontakt"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Pridať účet"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pridať nový účet"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportovať súbory databázy"</string>
@@ -438,7 +434,7 @@
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefón"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"Poslať e-mail"</string>
<string name="postalLabelsGroup" msgid="3487738141112589324">"Adresa"</string>
- <string name="imLabelsGroup" msgid="3898238486262614027">"Čet"</string>
+ <string name="imLabelsGroup" msgid="3898238486262614027">"Okamžité správy"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizácia"</string>
<string name="relationLabelsGroup" msgid="1854373894284572781">"Vzťah"</string>
<string name="eventLabelsGroup" msgid="7960408705307831289">"Špeciálny dátum"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9b3842b..fb89e81 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izberite privzeti račun za nove stike:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj nov stik"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Urejanje stika"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Dodaj račun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj nov račun"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvoz datotek zbirke"</string>
@@ -300,7 +296,7 @@
<string name="editor_more_fields" msgid="3630987771304393421">"Več polj"</string>
<string name="editor_change_photo_content_description" msgid="754100561085306263">"Sprememba fotografije"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"Odpiranje urejevalnika ni uspelo."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"Shranjevanje v"</string>
+ <string name="editor_account_selector_title" msgid="4426337993307015833">"Shranjevanje v:"</string>
<string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Ogled v teku"</string>
<string name="editor_account_selector_description" msgid="3324358600570627740">"Trenutno se shranjuje v račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Če želite izbrati drug račun, se dvakrat dotaknite."</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 1982a43..ff86b90 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Zgjidh një llogari të parazgjedhur për kontaktet e reja:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Shto një kontakt të ri"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Redakto"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Shto një llogari"</string>
<string name="add_new_account" msgid="5748627740680940264">"Shto një llogari të re"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksporto skedarët e bazës së të dhënave"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 880e5e1..b59513e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -248,10 +248,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Изаберите подразумевани налог за нове контакте:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Додај нови контакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Измени контакт"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Додај налог"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додај нови налог"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Извези датотеке базе података"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6531b50..127bb9d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Välj ett standardkonto för nya kontakter:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Lägg till ny kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Redigera kontakt"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Lägg till ett konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lägg till ett nytt konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportera databasfiler"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bd229df..5c3fe7d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Chagua akaunti ya msingi ya anwani mpya:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Ongeza anwani mpya"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Badilisha anwani"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Ongeza akaunti"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ongeza akaunti mpya"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Hamisha faili za hifadhidata"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index d77feda..d6ebf9a 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"புதிய தொடர்புகளுக்கான இயல்பு கணக்கைத் தேர்வுசெய்க:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"புதிய தொடர்பைச் சேர்"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"தொடர்பைத் திருத்து"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"கணக்கைச் சேர்"</string>
<string name="add_new_account" msgid="5748627740680940264">"புதிய கணக்கைச் சேர்"</string>
<string name="menu_export_database" msgid="2659719297530170820">"தரவுத்தள கோப்புகளை ஏற்றுமதி செய்"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index be830ca..9be46a5 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"కొత్త పరిచయాల కోసం డిఫాల్ట్ ఖాతాను ఎంచుకోండి:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"కొత్త పరిచయం చేర్చు"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"సవరించండి"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"ఖాతాను జోడించు"</string>
<string name="add_new_account" msgid="5748627740680940264">"కొత్త ఖాతాను జోడించు"</string>
<string name="menu_export_database" msgid="2659719297530170820">"డేటాబేస్ ఫైల్లను ఎగుమతి చేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5d6f776..557fa32 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"เลือกบัญชีเริ่มต้นสำหรับรายชื่อติดต่อใหม่:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"เพิ่มรายชื่อติดต่อ"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"แก้ไขรายชื่อติดต่อ"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"เพิ่มบัญชี"</string>
<string name="add_new_account" msgid="5748627740680940264">"เพิ่มบัญชีใหม่"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ส่งออกไฟล์ฐานข้อมูล"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d72c014..befa80a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Pumili ng default na account para sa mga bagong contact:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Mag-add ng contact"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"I-edit"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Magdagdag ng account"</string>
<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>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%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="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Gagana nang mas maayos ang Hangouts kapag inilagay mo ang identifier sa Hangouts ng isang tao sa field ng email o sa field ng telepono."</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Higit pang mga field"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"Baguhin ang larawan"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"Nabigong buksan ang editor."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"Sine-save sa"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Tinitingnan"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"Kasalukuyang sine-save sa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. I-double tap upang pumili ng ibang account."</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="one">Mga naka-link na contact (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="other">Mga naka-link na contact (<xliff:g id="COUNT">%d</xliff:g>)</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> (na) naka-link na contact"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"I-LINK ANG MGA CONTACT"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ang contact na ito"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mga posibleng duplicate"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Maaaring iisang tao ang mga contact na ito. Maaari mong i-link ang mga ito sa isa\'t isa bilang iisang contact."</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"Mga naka-link na contact"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"Mula sa iyong mga account"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Pumili ng larawan"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Mula kay <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7f8e6da..15b8b18 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Yeni kişiler için bir varsayılan hesap seçin:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Yeni kişi ekle"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Kişiyi düzenle"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Hesap ekle"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yeni hesap ekle"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Veritabanı dosyalarını dışarı aktar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 20f3d41..3221c72 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -255,10 +255,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Виберіть обліковий запис за умовчанням для нових контактів:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Додати контакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Змінити контакт"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Додати обліковий запис"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додати новий обліковий запис"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Експортувати файли бази даних"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index e33e1d0..83183a8 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"نئے رابطوں کیلئے ایک ڈیفالٹ اکاؤنٹ منتخب کریں:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"نیا رابطہ شامل کریں"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"رابطہ میں ترمیم کریں"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"اکاؤنٹ شامل کریں"</string>
<string name="add_new_account" msgid="5748627740680940264">"نیا اکاؤنٹ شامل کریں"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ڈیٹا بیس فائلیں برآمد کریں"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"حالیہ کال۔ <xliff:g id="CALL_TYPE">%s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%s</xliff:g>۔ <xliff:g id="DATE">%s</xliff:g>۔ واپسی کال کرنے کیلئے کلک کریں"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"آپ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"جب آپ کسی شخص کا Hangouts شناخت کنندہ ای میل فیلڈ یا فون فیلڈ میں داخل کرتے ہیں تو Hangouts بہتر کام کرتا ہے۔"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"مزید فیلڈز"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"تصویر بدلیں"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"ایڈیٹر کھولنے میں ناکام۔"</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"اس میں محفوظ ہو رہا ہے"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"ملاحظہ کیا جا رہا ہے"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"فی الحال <xliff:g id="ACCOUNT_NAME">%s</xliff:g> میں محفوظ کیا جا رہا ہے۔ کوئی مختلف اکاؤنٹ منتخـب کرنے کیلئے دو بار تھپتھپائیں۔"</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="other">لنک کردہ رابطے (<xliff:g id="COUNT">%d</xliff:g>)</item>
- <item quantity="one">لنک کردہ رابطہ</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> لنک کردہ رابطے"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"رابطے لنک کریں"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"یہ رابطہ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ممکنہ ڈپلیکیٹس"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"یہ رابطے ایک ہی شخص کے ہو سکتے ہیں۔ آپ انہیں ایک رابطے کے طور پر آپس میں لنک کر سکتے ہیں۔"</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"لنک کردہ رابطے"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"آپ کے اکاؤنٹس سے"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"تصویر چنیں"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> سے"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 7032cd9..1bf3bfd 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Yangi kontaktlar uchun birlamchi hisobni tanlang:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Yangi kontakt qo‘shish"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Kontaktni tahrirlash"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Hisob qo‘shish"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yangi hisob qo‘shish"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Ma’lumotlar bazasi fayllarini eksport qilish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 66a491e..e8a7dc1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Chọn tài khoản mặc định cho các liên hệ mới:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Thêm liên hệ mới"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Chỉnh sửa liên hệ"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Thêm tài khoản"</string>
<string name="add_new_account" msgid="5748627740680940264">"Thêm tài khoản mới"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Xuất các tệp cơ sở dữ liệu"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4f6c44c..7ebe53b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"选择用来保存新建联系人的默认帐号："</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"新增联系人"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"修改联系人"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"添加帐号"</string>
<string name="add_new_account" msgid="5748627740680940264">"添加新帐号"</string>
<string name="menu_export_database" msgid="2659719297530170820">"导出数据库文件"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"近期通话：<xliff:g id="CALL_TYPE">%s</xliff:g>，<xliff:g id="PHONE_NUMBER">%s</xliff:g>，<xliff:g id="DATE">%s</xliff:g>。点按可回拨。"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"请将联系人的环聊帐号信息输入到电子邮件地址字段或电话号码字段，以便获得更佳的环聊使用体验。"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"更多字段"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"更换照片"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"无法开启编辑器。"</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"保存到"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"正在查看"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"目前的设置是保存到“<xliff:g id="ACCOUNT_NAME">%s</xliff:g>”。点按两次即可选择其他帐号。"</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="other">已关联的联系人（<xliff:g id="COUNT">%d</xliff:g> 人）</item>
- <item quantity="one">已关联的联系人</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> 位已关联的联系人"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"关联联系人"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"此联系人"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"可能重复的联系人"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"这些联系人可能是同一个人。您可以将它们关联在一起，以合并成一个联系人。"</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"已关联的联系人"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"来自您的帐号"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"选择照片"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"来源：<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b53c904..655f520 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"為新聯絡人選擇預設帳戶："</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"新增聯絡人"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"編輯聯絡人"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"新增帳戶"</string>
<string name="add_new_account" msgid="5748627740680940264">"新增帳戶"</string>
<string name="menu_export_database" msgid="2659719297530170820">"匯出資料庫檔案"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2437afc..7a2bac2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"為新建立的聯絡人選擇一個預設帳戶："</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"新增聯絡人"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"編輯聯絡人"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"新增帳戶"</string>
<string name="add_new_account" msgid="5748627740680940264">"新增帳戶"</string>
<string name="menu_export_database" msgid="2659719297530170820">"匯出資料庫檔案"</string>
@@ -283,16 +279,19 @@
<string name="content_description_recent_call" msgid="5183800406316723676">"近期通話。<xliff:g id="CALL_TYPE">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。按一下即可回電"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"如果您在電子郵件欄位或電話欄位中輸入聯絡人的 Hangouts 識別碼，可讓 Hangouts 的運作效能更佳。"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"更多欄位"</string>
- <string name="editor_change_photo_content_description" msgid="754100561085306263">"變更相片"</string>
- <string name="editor_failed_to_load" msgid="1623639078580475818">"無法開啟編輯器。"</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"儲存到"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"查看中"</string>
- <string name="editor_account_selector_description" msgid="3324358600570627740">"目前設為儲存到 <xliff:g id="ACCOUNT_NAME">%s</xliff:g>。輕觸兩下即可選擇其他帳戶。"</string>
- <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
- <item quantity="other">已連結的聯絡人 (<xliff:g id="COUNT">%d</xliff:g> 位)</item>
- <item quantity="one">已連結的聯絡人</item>
- </plurals>
+ <!-- no translation found for editor_more_fields (3630987771304393421) -->
+ <skip />
+ <!-- no translation found for editor_change_photo_content_description (754100561085306263) -->
+ <skip />
+ <!-- no translation found for editor_failed_to_load (1623639078580475818) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_title (4426337993307015833) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_read_only_title (8315171723911587719) -->
+ <skip />
+ <!-- no translation found for editor_account_selector_description (3324358600570627740) -->
+ <skip />
+ <!-- no translation found for editor_linked_contacts_selector_title (249075501821303190) -->
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> 位已連結的聯絡人"</string>
<string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"連結聯絡人"</string>
@@ -313,7 +312,8 @@
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"這位聯絡人"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"可能重複的聯絡人"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"這些聯絡人可能是同一人。您可以將這些聯絡人連結合併成單筆聯絡人資料。"</string>
- <string name="editor_linked_contacts_title" msgid="3077479751631492125">"已連結的聯絡人"</string>
+ <!-- no translation found for editor_linked_contacts_title (3077479751631492125) -->
+ <skip />
<string name="from_your_accounts" msgid="1746293107836889912">"來自您的帳戶"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"選擇相片"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"來自<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bfcddab..f08eb25 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -241,10 +241,6 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Khetha i-akhawunti ezenzakalelayo yoxhumana nabo abasha:"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Engeza oxhumana naye omusha"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Hlela oxhumana naye"</string>
- <!-- no translation found for contact_editor_pick_raw_contact_dialog_title (9020902336507940034) -->
- <skip />
- <!-- no translation found for contact_editor_pick_raw_contact_read_only (5505352743052484053) -->
- <skip />
<string name="add_account" msgid="8201790677994503186">"Engeza i-akhawunti"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yengeza i-akhawunti enthsha"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Khipha amafayela emininingo egciniwe"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c911c9..c80c53c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1812,6 +1812,8 @@
<!-- Toast shown on settings screen when importing from SIM completes with an error -->
<string name="sim_import_failed_toast">Failed to import SIM contacts</string>
+ <!-- Error message displayed to user when they started the app, but could not sign in to Google's servers. [CHAR LIMIT=50]-->
+ <string name="connection_failed">Failed to sign in</string>
<!-- Title of SIM import dialog for accessibility; this isn't displayed but is announced
by talkback when the window is shown -->
<string name="sim_import_dialog_title">Select contacts to import</string>
diff --git a/src-bind/com/android/contactsbind/ObjectFactory.java b/src-bind/com/android/contactsbind/ObjectFactory.java
index c9539ee..490f6ee 100644
--- a/src-bind/com/android/contactsbind/ObjectFactory.java
+++ b/src-bind/com/android/contactsbind/ObjectFactory.java
@@ -13,8 +13,10 @@
*/
package com.android.contactsbind;
+import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.common.logging.Logger;
import com.android.contacts.common.preference.PreferenceManager;
+import com.android.contacts.common.util.NavigationDrawer;
import com.android.contactsbind.search.AutocompleteHelper;
import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
@@ -53,4 +55,8 @@
public static Intent getContactSheetIntent(Context context, Uri contactLookupUri) {
return null;
}
+
+ public static NavigationDrawer getNavigationDrawer(ContactsDrawerActivity activity) {
+ return new NavigationDrawer.Default(activity);
+ }
}
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 0892baf..25d7849 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -26,12 +26,14 @@
import android.os.Bundle;
import android.provider.ContactsContract.Intents;
import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -58,6 +60,7 @@
import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
import com.android.contacts.common.util.ImplicitIntentsUtil;
import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.common.util.NavigationDrawer;
import com.android.contacts.common.util.ViewUtil;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.editor.SelectAccountDialogFragment;
@@ -77,6 +80,7 @@
import com.android.contactsbind.ObjectFactory;
import com.android.contactsbind.experiments.Flags;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -142,7 +146,7 @@
private void stopSearchAndSelection() {
final MultiSelectContactsListFragment listFragment;
- if (isAllContactsView() || isAccountView()) {
+ if (isAccountView()) {
listFragment = getAllFragment();
} else if (isGroupView()) {
listFragment = getGroupFragment();
@@ -188,7 +192,7 @@
}
protected ContactListFilterController mContactListFilterController;
- protected DrawerLayout mDrawer;
+ protected DrawerLayout mDrawerLayout;
protected ContactsActionBarDrawerToggle mToggle;
protected Toolbar mToolbar;
protected NavigationView mNavigationView;
@@ -198,6 +202,8 @@
// The account the new group will be created under.
private AccountWithDataSet mNewGroupAccount;
+ private NavigationDrawer mNavigationDrawer;
+
// Checkable menu item lookup maps. Every map declared here should be added to
// clearCheckedMenus() so that they can be cleared.
// TODO find a better way to handle selected menu item state, when switching to fragments.
@@ -205,10 +211,19 @@
protected Map<ContactListFilter, MenuItem> mFilterMenuMap = new HashMap<>();
protected Map<Integer, MenuItem> mIdMenuMap = new HashMap<>();
+ private List<GroupListItem> mGroupListItems;
+ private List<ContactListFilter> mAccountFilterItems;
+ private AccountWithDataSet mCurrentAccount;
+
+ protected boolean mShouldShowAccountSwitcher;
+
@Override
protected void onCreate(Bundle savedState) {
super.onCreate(savedState);
+ mShouldShowAccountSwitcher =
+ Flags.getInstance(this).getBoolean(Experiments.ACCOUNT_SWITCHER);
+
mContactListFilterController = ContactListFilterController.getInstance(this);
mContactListFilterController.checkFilterValidity(false);
@@ -222,11 +237,12 @@
ViewUtil.addRectangularOutlineProvider(findViewById(R.id.toolbar_parent), getResources());
// Set up hamburger button.
- mDrawer = (DrawerLayout) findViewById(R.id.drawer_layout);
- mToggle = new ContactsActionBarDrawerToggle(this, mDrawer, mToolbar,
+ mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+ mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar,
R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+ mDrawerLayout.setDrawerListener(mToggle);
+ mToggle.syncState();
- mDrawer.setDrawerListener(mToggle);
// Set fallback handler for when drawer is disabled.
mToggle.setToolbarNavigationClickListener(new View.OnClickListener() {
@Override
@@ -239,25 +255,31 @@
if (savedState != null) {
mCurrentView = ContactsView.values()[savedState.getInt(KEY_CONTACTS_VIEW)];
} else {
- mCurrentView = ContactsView.ALL_CONTACTS;
+ resetContactsView();
}
- // Set up hamburger menu items.
- mNavigationView = (NavigationView) findViewById(R.id.nav_view);
- mNavigationView.setNavigationItemSelectedListener(this);
- setUpMenu();
-
loadGroupsAndFilters();
if (savedState != null && savedState.containsKey(KEY_NEW_GROUP_ACCOUNT)) {
mNewGroupAccount = AccountWithDataSet.unstringify(
savedState.getString(KEY_NEW_GROUP_ACCOUNT));
}
+
+ mNavigationDrawer = ObjectFactory.getNavigationDrawer(this);
+
+ mNavigationView = mNavigationDrawer.getNavigationView();
+ mNavigationView.setNavigationItemSelectedListener(this);
+ setUpMenu();
+ }
+
+ protected void resetContactsView() {
+ mCurrentView = mShouldShowAccountSwitcher
+ ? ContactsView.ACCOUNT_VIEW : ContactsView.ALL_CONTACTS;
}
public void setDrawerLockMode(boolean enabled) {
// Prevent drawer from being opened by sliding from the start of screen.
- mDrawer.setDrawerLockMode(enabled ? DrawerLayout.LOCK_MODE_UNLOCKED
+ mDrawerLayout.setDrawerLockMode(enabled ? DrawerLayout.LOCK_MODE_UNLOCKED
: DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
// Order of these statements matter.
@@ -298,10 +320,14 @@
menu.removeItem(R.id.nav_help);
}
- final MenuItem allContactsMenu = menu.findItem(R.id.nav_all_contacts);
- mIdMenuMap.put(R.id.nav_all_contacts, allContactsMenu);
- if (isAllContactsView()) {
- updateMenuSelection(allContactsMenu);
+ if (!mShouldShowAccountSwitcher) {
+ final MenuItem allContactsMenu = menu.findItem(R.id.nav_all_contacts);
+ mIdMenuMap.put(R.id.nav_all_contacts, allContactsMenu);
+ if (isAllContactsView()) {
+ updateMenuSelection(allContactsMenu);
+ }
+ } else {
+ menu.removeItem(R.id.nav_all_contacts);
}
}
@@ -321,9 +347,11 @@
@Override
protected void onResume() {
super.onResume();
- if (mDrawer.isDrawerOpen(GravityCompat.START)) {
+ if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
updateStatusBarBackground();
}
+ // Restoring recent accounts.
+ mNavigationDrawer.onResume();
}
public void updateStatusBarBackground() {
@@ -333,11 +361,12 @@
public void updateStatusBarBackground(int color) {
if (!CompatUtils.isLollipopCompatible()) return;
if (color == -1) {
- mDrawer.setStatusBarBackgroundColor(MaterialColorMapUtils.getStatusBarColor(this));
+ mDrawerLayout.setStatusBarBackgroundColor(
+ MaterialColorMapUtils.getStatusBarColor(this));
} else {
- mDrawer.setStatusBarBackgroundColor(color);
+ mDrawerLayout.setStatusBarBackgroundColor(color);
}
- mDrawer.invalidate();
+ mDrawerLayout.invalidate();
getWindow().setStatusBarColor(Color.TRANSPARENT);
}
@@ -353,6 +382,24 @@
mToggle.onConfigurationChanged(newConfig);
}
+ @Override
+ protected void onStart() {
+ super.onStart();
+ mNavigationDrawer.onStart();
+ }
+
+ @Override
+ protected void onPause() {
+ mNavigationDrawer.onPause();
+ super.onPause();
+ }
+
+ @Override
+ protected void onStop() {
+ mNavigationDrawer.onStop();
+ super.onStop();
+ }
+
// Set up fragment manager to load groups and filters.
protected void loadGroupsAndFilters() {
final FragmentManager fragmentManager = getFragmentManager();
@@ -393,15 +440,39 @@
public void onGroupsLoaded(List<GroupListItem> groupListItems) {
final Menu menu = mNavigationView.getMenu();
final MenuItem groupsMenuItem = menu.findItem(R.id.nav_groups);
+ if (groupsMenuItem == null) {
+ return;
+ }
+ final SubMenu subMenu = groupsMenuItem.getSubMenu();
+ subMenu.removeGroup(R.id.nav_groups_items);
+
+ mGroupListItems = groupListItems;
+
+ if (mShouldShowAccountSwitcher && mCurrentAccount != null) {
+ updateGroupMenuForAccount(mCurrentAccount);
+ } else {
+ updateGroupMenuForAccount(null);
+ }
+ }
+
+ /**
+ * Update menu items in group section of navigation drawer based on {@link AccountWithDataSet}.
+ * If {@link AccountWithDataSet} is null, then we show groups in all accounts.
+ */
+ public void updateGroupMenuForAccount(AccountWithDataSet account) {
+ mCurrentAccount = account;
+
+ final Menu menu = mNavigationView.getMenu();
+ final MenuItem groupsMenuItem = menu.findItem(R.id.nav_groups);
final SubMenu subMenu = groupsMenuItem.getSubMenu();
subMenu.removeGroup(R.id.nav_groups_items);
mGroupMenuMap = new HashMap<>();
final GroupMetaData groupMetaData = getGroupMetaData();
- if (groupListItems != null) {
+ if (mGroupListItems != null ) {
// Add each group
- for (final GroupListItem groupListItem : groupListItems) {
+ for (final GroupListItem groupListItem : getGroupsForCurrentAccount(mCurrentAccount)) {
if (GroupUtil.isEmptyFFCGroup(groupListItem)) {
continue;
}
@@ -425,7 +496,7 @@
updateMenuSelection(menuItem);
}
});
- mDrawer.closeDrawer(GravityCompat.START);
+ mDrawerLayout.closeDrawer(GravityCompat.START);
return true;
}
});
@@ -450,17 +521,33 @@
onCreateGroupMenuItemClicked();
}
});
- mDrawer.closeDrawer(GravityCompat.START);
+ mDrawerLayout.closeDrawer(GravityCompat.START);
return true;
}
});
if (isGroupView() && groupMetaData != null) {
- updateGroupMenu(groupMetaData);
+ updateGroupMenuCheckedStatus(groupMetaData);
}
}
- public void updateGroupMenu(GroupMetaData groupMetaData) {
+ private List<GroupListItem> getGroupsForCurrentAccount(AccountWithDataSet account) {
+ final List<GroupListItem> desiredGroupItems = new ArrayList<>();
+ if (account == null) {
+ desiredGroupItems.addAll(mGroupListItems);
+ } else {
+ for (GroupListItem group : mGroupListItems) {
+ if (TextUtils.equals(mCurrentAccount.name, group.getAccountName())
+ && TextUtils.equals(mCurrentAccount.type, group.getAccountType())
+ && TextUtils.equals(mCurrentAccount.dataSet, group.getDataSet())) {
+ desiredGroupItems.add(group);
+ }
+ }
+ }
+ return desiredGroupItems;
+ }
+
+ public void updateGroupMenuCheckedStatus(GroupMetaData groupMetaData) {
clearCheckedMenus();
if (groupMetaData != null && mGroupMenuMap != null
&& mGroupMenuMap.get(groupMetaData.groupId) != null) {
@@ -500,7 +587,12 @@
final Account account = extras == null ? null :
(Account) extras.getParcelable(Intents.Insert.EXTRA_ACCOUNT);
if (account == null) {
- selectAccountForNewGroup();
+ if (mShouldShowAccountSwitcher && mCurrentAccount != null) {
+ // Create a new group in current account.
+ onAccountChosen(mCurrentAccount, /* extraArgs */ null);
+ } else {
+ selectAccountForNewGroup();
+ }
} else {
final String dataSet = extras == null
? null : extras.getString(Intents.Insert.EXTRA_DATA_SET);
@@ -512,6 +604,11 @@
@Override
public void onFiltersLoaded(List<ContactListFilter> accountFilterItems) {
+ mAccountFilterItems = accountFilterItems;
+
+ // Don't show accounts in menu if we enable account switcher.
+ if (mShouldShowAccountSwitcher) return;
+
final AccountDisplayInfoFactory accountDisplayFactory = AccountDisplayInfoFactory.
fromListFilters(this, accountFilterItems);
@@ -525,7 +622,6 @@
return;
}
-
for (int i = 0; i < accountFilterItems.size(); i++) {
final ContactListFilter filter = accountFilterItems.get(i);
final AccountDisplayInfo displayableAccount =
@@ -549,7 +645,7 @@
updateMenuSelection(menuItem);
}
});
- mDrawer.closeDrawer(GravityCompat.START);
+ mDrawerLayout.closeDrawer(GravityCompat.START);
return true;
}
});
@@ -591,8 +687,21 @@
AppCompatActivity.RESULT_OK, intent);
}
+ public void changeFilter(AccountWithDataSet account) {
+ for (ContactListFilter filter : mAccountFilterItems) {
+ if (account.equals(filter.toAccountWithDataSet())) {
+ final Intent intent = new Intent();
+ intent.putExtra(AccountFilterActivity.EXTRA_CONTACT_LIST_FILTER, filter);
+ AccountFilterUtil.handleAccountFilterResult(mContactListFilterController,
+ AppCompatActivity.RESULT_OK, intent);
+ clearCheckedMenus();
+ break;
+ }
+ }
+ }
+
@Override
- public boolean onNavigationItemSelected(final MenuItem item) {
+ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
final int id = item.getItemId();
mToggle.runWhenIdle(new Runnable() {
@Override
@@ -617,10 +726,14 @@
}
});
- mDrawer.closeDrawer(GravityCompat.START);
+ mDrawerLayout.closeDrawer(GravityCompat.START);
return true;
}
+ public void closeDrawer() {
+ mDrawerLayout.closeDrawer(GravityCompat.START);
+ }
+
private Intent createPreferenceIntent() {
final Intent intent = new Intent(this, ContactsPreferenceActivity.class);
intent.putExtra(ContactsPreferenceActivity.EXTRA_NEW_LOCAL_PROFILE,
@@ -629,12 +742,15 @@
}
public void switchToAllContacts() {
- resetFilter();
+ if (mShouldShowAccountSwitcher) {
+ clearCheckedMenus();
+ } else {
+ resetFilter();
- final Menu menu = mNavigationView.getMenu();
- final MenuItem allContacts = menu.findItem(R.id.nav_all_contacts);
- updateMenuSelection(allContacts);
-
+ final Menu menu = mNavigationView.getMenu();
+ final MenuItem allContacts = menu.findItem(R.id.nav_all_contacts);
+ updateMenuSelection(allContacts);
+ }
setTitle(getString(R.string.contactsList));
}
@@ -669,6 +785,9 @@
}
private void setMenuChecked(MenuItem menuItem, boolean checked) {
+ if (menuItem == null) {
+ return;
+ }
menuItem.setCheckable(checked);
menuItem.setChecked(checked);
}
@@ -694,6 +813,7 @@
@Override
public void onAccountChosen(AccountWithDataSet account, Bundle extraArgs) {
+ if (account == null) return;
mNewGroupAccount = account;
GroupNameEditDialogFragment.newInstanceForCreation(
mNewGroupAccount, GroupUtil.ACTION_CREATE_GROUP)
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 9326b0d..acebcd9 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -284,7 +284,7 @@
if (isGroupDeleteAction(intent.getAction())) {
toast(R.string.groupDeletedToast);
popSecondLevel();
- mCurrentView = ContactsView.ALL_CONTACTS;
+ resetContactsView();
showFabWithAnimation(/* showFab */ true);
return;
}
@@ -514,6 +514,9 @@
final int providerStatus = mProviderStatusWatcher.getProviderStatus();
final Menu menu = mNavigationView.getMenu();
final MenuItem groupsMenuItem = menu.findItem(R.id.nav_groups);
+ if (groupsMenuItem == null) {
+ return;
+ }
final SubMenu subMenu = groupsMenuItem.getSubMenu();
// Reload groups and filters if provider status changes to "normal" and there's no groups
@@ -617,8 +620,8 @@
}
// Handle the back event in drawer first.
- if (mDrawer.isDrawerOpen(GravityCompat.START)) {
- mDrawer.closeDrawer(GravityCompat.START);
+ if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+ mDrawerLayout.closeDrawer(GravityCompat.START);
return;
}
@@ -685,7 +688,8 @@
return true;
}
- if (!AccountFilterUtil.isAllContactsFilter(mContactListFilterController.getFilter())
+ if (!mShouldShowAccountSwitcher
+ && !AccountFilterUtil.isAllContactsFilter(mContactListFilterController.getFilter())
&& !mAllFragment.isHidden()) {
// If mAllFragment is hidden, then mContactsUnavailableFragment is visible so we
// don't need to switch to all contacts.
@@ -764,6 +768,17 @@
super.onFilterMenuItemClicked(intent);
}
+ @Override
+ public void changeFilter(AccountWithDataSet account) {
+ super.changeFilter(account);
+ // We must pop second level first to "restart" mAllFragment, before changing filter.
+ if (isInSecondLevel()) {
+ popSecondLevel();
+ showFabWithAnimation(/* showFab */ true);
+ }
+ mCurrentView = ContactsView.ACCOUNT_VIEW;
+ }
+
private void switchToOrUpdateGroupView(String action) {
// If group fragment is active and visible, we simply update it.
if (mMembersFragment != null && !mMembersFragment.isInactive()) {
@@ -826,7 +841,7 @@
popSecondLevel();
}
mShouldSwitchToAllContacts = false;
- mCurrentView = ContactsView.ALL_CONTACTS;
+ resetContactsView();
showFabWithAnimation(/* showFab */ true);
mAllFragment.scrollToTop();
diff --git a/src/com/android/contacts/common/Experiments.java b/src/com/android/contacts/common/Experiments.java
index df709b3..56aa85b 100644
--- a/src/com/android/contacts/common/Experiments.java
+++ b/src/com/android/contacts/common/Experiments.java
@@ -21,6 +21,11 @@
public final class Experiments {
/**
+ * Experiment to enable account switcher
+ */
+ public static final String ACCOUNT_SWITCHER = "Account__account_switcher_enable";
+
+ /**
* Experiment to enable assistant in left navigation drawer.
*/
public static final String ASSISTANT = "Assistant__enable_assistant";
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/common/list/ContactListFilter.java
index c6baf41..cdea37a 100644
--- a/src/com/android/contacts/common/list/ContactListFilter.java
+++ b/src/com/android/contacts/common/list/ContactListFilter.java
@@ -394,11 +394,11 @@
/**
* Returns true if this ContactListFilter contains at least one Google account.
- * (see {@link #isGoogleAccountType)
+ * (see {@link #isWritableGoogleTypeFilter )
*/
public boolean isSyncable(List<AccountWithDataSet> accounts) {
// TODO(samchen): Check FILTER_TYPE_CUSTOM
- if (isGoogleAccountType() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
+ if (isWritableGoogleTypeFilter() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
return true;
}
if (filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS
@@ -407,8 +407,7 @@
// If we're showing all contacts and there is any Google account on the device then
// we're syncable.
for (AccountWithDataSet account : accounts) {
- if (GoogleAccountType.ACCOUNT_TYPE.equals(account.type)
- && account.dataSet == null) {
+ if (account.isWritableGoogleAccount()) {
return true;
}
}
@@ -418,19 +417,18 @@
}
/**
- * Returns the Google accounts (see {@link #isGoogleAccountType) for this ContactListFilter.
+ * Returns the Google accounts (see {@link #isWritableGoogleTypeFilter ) for this ContactListFilter.
*/
public List<Account> getSyncableAccounts(List<AccountWithDataSet> accounts) {
final List<Account> syncableAccounts = new ArrayList<>();
// TODO(samchen): Check FILTER_TYPE_CUSTOM
- if (isGoogleAccountType() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
+ if (isWritableGoogleTypeFilter() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
syncableAccounts.add(new Account(accountName, accountType));
} else if (filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS
|| filterType == ContactListFilter.FILTER_TYPE_DEFAULT) {
if (accounts != null && accounts.size() > 0) {
for (AccountWithDataSet account : accounts) {
- if (GoogleAccountType.ACCOUNT_TYPE.equals(account.type)
- && account.dataSet == null) {
+ if (account.isWritableGoogleAccount()) {
syncableAccounts.add(new Account(account.name, account.type));
}
}
@@ -443,7 +441,7 @@
* Returns true if this ContactListFilter is Google account type. (i.e. where
* accountType = "com.google" and dataSet = null)
*/
- public boolean isGoogleAccountType() {
+ public boolean isWritableGoogleTypeFilter() {
return GoogleAccountType.ACCOUNT_TYPE.equals(accountType) && dataSet == null;
}
}
diff --git a/src/com/android/contacts/common/list/ContactListFilterController.java b/src/com/android/contacts/common/list/ContactListFilterController.java
index 4d3d6ad..5ceef18 100644
--- a/src/com/android/contacts/common/list/ContactListFilterController.java
+++ b/src/com/android/contacts/common/list/ContactListFilterController.java
@@ -81,6 +81,8 @@
* which case, we should switch to the last saved filter in {@link SharedPreferences}.
*/
public abstract void checkFilterValidity(boolean notifyListeners);
+
+ public abstract Context getContext();
}
/**
@@ -196,4 +198,9 @@
mFilter.accountName, mFilter.accountType, mFilter.dataSet);
return accountTypeManager.contains(filterAccount, /* contactWritableOnly */ false);
}
+
+ @Override
+ public Context getContext() {
+ return mContext;
+ }
}
diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/common/model/AccountTypeManager.java
index 705f5bf..274020b 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/common/model/AccountTypeManager.java
@@ -290,13 +290,13 @@
return -1;
} else if (a.name == null || a.type == null) {
return 1;
- } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
+ } else if (a.isWritableGoogleAccount() && a.equals(mDefaultAccount)) {
return -1;
- } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
+ } else if (b.isWritableGoogleAccount() && b.equals(mDefaultAccount)) {
return 1;
- } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
+ } else if (a.isWritableGoogleAccount() && !b.isWritableGoogleAccount()) {
return -1;
- } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
+ } else if (b.isWritableGoogleAccount() && !a.isWritableGoogleAccount()) {
return 1;
} else {
int diff = a.name.compareToIgnoreCase(b.name);
@@ -316,10 +316,6 @@
}
}
}
-
- private static boolean isWritableGoogleAccount(AccountWithDataSet account) {
- return GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null;
- }
}
class AccountTypeManagerImpl extends AccountTypeManager
diff --git a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java b/src/com/android/contacts/common/model/account/AccountDisplayInfo.java
index f68fdd5..c5463d6 100644
--- a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java
+++ b/src/com/android/contacts/common/model/account/AccountDisplayInfo.java
@@ -65,7 +65,7 @@
}
public boolean isGoogleAccount() {
- return GoogleAccountType.ACCOUNT_TYPE.equals(mSource.type) && mSource.dataSet == null;
+ return mSource.isWritableGoogleAccount();
}
public boolean isDeviceAccount() {
diff --git a/src/com/android/contacts/common/model/account/AccountWithDataSet.java b/src/com/android/contacts/common/model/account/AccountWithDataSet.java
index 37f6652..38b9eee 100644
--- a/src/com/android/contacts/common/model/account/AccountWithDataSet.java
+++ b/src/com/android/contacts/common/model/account/AccountWithDataSet.java
@@ -79,6 +79,10 @@
mAccountTypeWithDataSet = AccountTypeWithDataSet.get(type, dataSet);
}
+ public boolean isWritableGoogleAccount() {
+ return GoogleAccountType.ACCOUNT_TYPE.equals(type) && dataSet == null;
+ }
+
public boolean isNullAccount() {
return name == null && type == null && dataSet == null;
}
diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/common/preference/ContactsPreferences.java
index 26073f4..4fa2dcc 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/common/preference/ContactsPreferences.java
@@ -22,12 +22,10 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.preference.PreferenceManager;
-import android.provider.ContactsContract;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.support.annotation.NonNull;
@@ -36,7 +34,6 @@
import com.android.contacts.common.R;
import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
import com.android.contacts.common.model.AccountTypeManager;
import java.util.ArrayList;
@@ -79,10 +76,15 @@
public static final String CONTACT_METADATA_AUTHORITY = "com.android.contacts.metadata";
+ public static final String ONLY_CLEAR_DONOT_SYNC = "only_clear_donot_sync";
+
public static final String SHOULD_CLEAR_METADATA_BEFORE_SYNCING =
"should_clear_metadata_before_syncing";
- public static final String ONLY_CLEAR_DONOT_SYNC = "only_clear_donot_sync";
+ private static final String NAV_DRAWER_FIRST_RECENT = "NavigationDrawer_first_recent";
+
+ private static final String NAV_DRAWER_SECOND_RECENT = "NavigationDrawer_second_recent";
+
/**
* Value to use when a preference is unassigned and needs to be read from the shared preferences
*/
@@ -248,6 +250,26 @@
return false;
}
+ public void setRecentAccounts(@NonNull List<String> recentAccounts) {
+ final int size = recentAccounts.size();
+ final Editor editor = mPreferences.edit();
+ editor.putString(NAV_DRAWER_FIRST_RECENT, size > 0 ? recentAccounts.get(0) : null);
+ editor.putString(NAV_DRAWER_SECOND_RECENT, size > 1 ? recentAccounts.get(1) : null);
+ editor.commit();
+ }
+
+ public void getRecentAccounts(List<String> recentAccounts) {
+ recentAccounts.clear();
+ String recent = mPreferences.getString(NAV_DRAWER_FIRST_RECENT, null);
+ if (recent != null) {
+ recentAccounts.add(recent);
+ }
+ recent = mPreferences.getString(NAV_DRAWER_SECOND_RECENT, null);
+ if (recent != null) {
+ recentAccounts.add(recent);
+ }
+ }
+
public String getContactMetadataSyncAccountName() {
final Account syncAccount = getContactMetadataSyncAccount();
return syncAccount == null ? DO_NOT_SYNC_CONTACT_METADATA_MSG : syncAccount.name;
@@ -309,7 +331,7 @@
final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(mContext);
List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(true);
for (AccountWithDataSet account : accounts) {
- if (GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null) {
+ if (account.isWritableGoogleAccount()) {
focusGoogleAccounts.add(account.getAccountOrNull());
}
}
diff --git a/src/com/android/contacts/common/util/AccountFilterUtil.java b/src/com/android/contacts/common/util/AccountFilterUtil.java
index b89e8b9..dbe8659 100644
--- a/src/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/src/com/android/contacts/common/util/AccountFilterUtil.java
@@ -32,6 +32,7 @@
import com.android.contacts.R;
import com.android.contacts.activities.ContactEditorActivity;
+import com.android.contacts.common.Experiments;
import com.android.contacts.common.list.AccountFilterActivity;
import com.android.contacts.common.list.ContactListFilter;
import com.android.contacts.common.list.ContactListFilterController;
@@ -42,6 +43,7 @@
import com.android.contacts.common.model.account.AccountWithDataSet;
import com.android.contacts.common.preference.ContactsPreferences;
import com.android.contactsbind.ObjectFactory;
+import com.android.contactsbind.experiments.Flags;
import com.google.common.collect.Lists;
@@ -89,8 +91,8 @@
if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {
filterController.selectCustomFilter();
} else {
- filterController.setContactListFilter(filter, /* persistent */
- filter.filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS);
+ filterController.setContactListFilter(filter,
+ shouldPersistFilter(filterController.getContext(), filter));
}
}
}
@@ -132,6 +134,7 @@
private static List<ContactListFilter> loadAccountFilters(Context context,
DeviceLocalAccountTypeFactory deviceAccountTypeFactory) {
final ArrayList<ContactListFilter> accountFilters = Lists.newArrayList();
+
final AccountTypeManager accountTypeManager = AccountTypeManager.getInstance(context);
final List<AccountWithDataSet> accounts = accountTypeManager.getSortedAccounts(
/* defaultAccount */ getDefaultAccount(context), /* contactWritableOnly */ true);
@@ -235,4 +238,11 @@
return account.withFormattedName(context, R.string.title_from_other_accounts)
.getNameLabel().toString();
}
+
+ public static boolean shouldPersistFilter(Context context, ContactListFilter filter) {
+ if (Flags.getInstance(context).getBoolean(Experiments.ACCOUNT_SWITCHER)) {
+ return true;
+ }
+ return filter != null && filter.isContactsFilterType();
+ }
}
diff --git a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java b/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
index 040a6b4..e54b31f 100644
--- a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
+++ b/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
@@ -52,7 +52,6 @@
public static boolean isLocalAccountType(DeviceLocalAccountTypeFactory factory,
String type) {
-
return isLocalAccountType(factory.classifyAccount(type));
}
}
diff --git a/src/com/android/contacts/common/util/NavigationDrawer.java b/src/com/android/contacts/common/util/NavigationDrawer.java
new file mode 100644
index 0000000..c60f029
--- /dev/null
+++ b/src/com/android/contacts/common/util/NavigationDrawer.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package com.android.contacts.common.util;
+
+import android.support.design.widget.NavigationView;
+import android.support.v7.app.AppCompatActivity;
+
+import com.android.contacts.R;
+
+public interface NavigationDrawer {
+ void onStart();
+ void onResume();
+ void onPause();
+ void onStop();
+ NavigationView getNavigationView();
+
+ class Default implements NavigationDrawer {
+
+ AppCompatActivity mActivity;
+
+ public Default(AppCompatActivity activity) {
+ mActivity = activity;
+ }
+
+ @Override
+ public void onStart() {}
+
+ @Override
+ public void onResume() {}
+
+ @Override
+ public void onPause() {}
+
+ @Override
+ public void onStop() {}
+
+ @Override
+ public NavigationView getNavigationView() {
+ return (NavigationView) mActivity.findViewById(R.id.nav_view);
+ }
+ }
+}
diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 30f339c..93438b3 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -549,7 +549,7 @@
maybeAttachCheckBoxListener();
mActivity.setTitle(mGroupMetaData.groupName);
- mActivity.updateGroupMenu(mGroupMetaData);
+ mActivity.updateGroupMenuCheckedStatus(mGroupMetaData);
mActivity.invalidateOptionsMenu();
// Start loading the group members
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 25315e8..c8fb863 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -28,6 +28,7 @@
import android.content.pm.ResolveInfo;
import android.database.Cursor;
import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract;
@@ -69,8 +70,13 @@
import com.android.contacts.common.logging.Logger;
import com.android.contacts.common.logging.ScreenEvent;
import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.common.model.account.AccountDisplayInfo;
+import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.common.model.account.AccountType;
import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.common.preference.ContactsPreferences;
import com.android.contacts.common.util.AccountFilterUtil;
+import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
import com.android.contacts.common.util.ImplicitIntentsUtil;
import com.android.contacts.interactions.ContactDeletionInteraction;
import com.android.contacts.interactions.ContactMultiDeletionInteraction;
@@ -80,6 +86,7 @@
import com.android.contacts.util.SyncUtil;
import com.android.contactsbind.experiments.Flags;
import com.android.contactsbind.FeatureHighlightHelper;
+import com.android.contactsbind.ObjectFactory;
import java.util.List;
import java.util.Locale;
@@ -135,6 +142,7 @@
private ContactsDrawerActivity mActivity;
private ContactsRequest mContactsRequest;
private ContactListFilterController mContactListFilterController;
+ private DeviceLocalAccountTypeFactory mDeviceLocalFactory;
private final ActionBarAdapter.Listener mActionBarListener = new ActionBarAdapter.Listener() {
@Override
@@ -426,13 +434,14 @@
mIsRecreatedInstance = (savedState != null);
mContactListFilterController = ContactListFilterController.getInstance(getContext());
mContactListFilterController.checkFilterValidity(false);
- // Use FILTER_TYPE_ALL_ACCOUNTS filter if the instance is not a re-created one.
- // This is useful when user upgrades app while an account filter was
- // stored in sharedPreference in a previous version of Contacts app.
- final ContactListFilter filter = mIsRecreatedInstance
- ? getFilter()
- : AccountFilterUtil.createContactsFilter(getContext());
- setContactListFilter(filter);
+ mDeviceLocalFactory = ObjectFactory.getDeviceLocalAccountTypeFactory(getContext());
+ if (!Flags.getInstance(getContext()).getBoolean(Experiments.ACCOUNT_SWITCHER)
+ && !mIsRecreatedInstance) {
+ // Use FILTER_TYPE_ALL_ACCOUNTS filter if the instance is not a re-created one.
+ // This is useful when user upgrades app while an account filter was
+ // stored in sharedPreference in a previous version of Contacts app.
+ setContactListFilter(AccountFilterUtil.createContactsFilter(getContext()));
+ }
}
@Override
@@ -825,7 +834,7 @@
*/
private void setContactListFilter(ContactListFilter filter) {
mContactListFilterController.setContactListFilter(filter,
- /* persistent */ isAllContactsFilter(filter));
+ AccountFilterUtil.shouldPersistFilter(getContext(), filter));
}
@Override