Implement linked contact menu option am: b9065ddb28
am: 3c23a05e38
Change-Id: Ica48eb87f4d70881b758daabe14fc69674110e76
diff --git a/Android.mk b/Android.mk
index c42434f..a03d671 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-bind res-icons $(phone_common_dir)/res
+res_dirs := res res-aosp res-icons $(phone_common_dir)/res
asset_dirs := assets
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6c97227..404b6a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10605"
- android:versionName="1.6.5">
+ android:versionCode="20000"
+ android:versionName="2.0.0">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
diff --git a/res-bind/layout/navigation_view.xml b/res-bind/layout/navigation_view.xml
deleted file mode 100644
index d553768..0000000
--- a/res-bind/layout/navigation_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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 2135903..814109f 100644
--- a/res/layout/contacts_drawer_activity.xml
+++ b/res/layout/contacts_drawer_activity.xml
@@ -17,6 +17,7 @@
<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"
@@ -24,7 +25,32 @@
android:fitsSystemWindows="true"
tools:openDrawer="start">
- <include layout="@layout/contacts_main_content"/>
+ <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/navigation_view"/>
+ <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"/>
+
</android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/contacts_main_content.xml b/res/layout/contacts_main_content.xml
deleted file mode 100644
index 748bdbb..0000000
--- a/res/layout/contacts_main_content.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/values-af/strings.xml b/res/values-af/strings.xml
index 10830cd..2e0607c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM-kontak ingevoer</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kon nie SIM-kontakte invoer nie"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Kon nie aanmeld nie"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Kies kontakte om in te voer"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Kanselleer invoer"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Outo-sinkronisering is af. Tik om aan te skakel."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f7f6da4..3505b23 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> የሲም እውቂያዎች መጥተዋል</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"የሲም እውቂያዎችን ማምጣት አልተሳካም"</string>
- <string name="connection_failed" msgid="7558253972301525402">"መግባት አልተሳካም"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ለማምጣት ዕውቂያዎችን ምረጥ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ማምጣት ይቅር"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ራስሰር-አስምር ጠፍቷል። ለማብራት መታ ያድርጉ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3e5af14..77f6795 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -698,7 +698,6 @@
<item quantity="one">تم استيراد جهة اتصال واحدة من شريحة SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"فشل استيراد جهات الاتصال من شريحة SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"أخفق تسجيل الدخول"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"حدد جهات اتصال لاستيرادها"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"إلغاء الاستيراد"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"المزامنة التلقائية متوقفة. انقر للتشغيل."</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index d3a8bcf..a76e8c0 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM kontakt</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM kontaktları import etmək olmadı"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Hesaba daxil olmaq olmadı"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"İmport üçün kontaktlar seçin"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"İmportu ləğv edin"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Avto-sinxronizasiya deaktivdir. Aktiv etmək üçün toxunun."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 170fb26..a3a788d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -40,7 +40,7 @@
<string name="menu_editContact" msgid="9042415603857662633">"Izmeni"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
<string name="menu_change_photo" msgid="7769177631511496210">"Promeni sliku"</string>
- <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Postavi na Početni ekran"</string>
+ <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Napravi prečicu"</string>
<string name="menu_call" msgid="3992595586042260618">"Pozovi kontakt"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Pošalji SMS kontaktu"</string>
<string name="menu_splitAggregate" msgid="2627252205317945563">"Razdvoji"</string>
@@ -60,14 +60,19 @@
<string name="joinConfirmation" msgid="8262614843581924365">"Želite li da sačuvate promene koje ste već obavili i objedinite ovaj kontakt sa izabranim kontaktom?"</string>
<string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Sačuvaj i objedini"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Objedini"</string>
+ <!-- no translation found for menu_linkedContacts (400444389718855621) -->
+ <skip />
<string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Objedinite kontakte"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite da objedinite sa kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži sve kontakte"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
+ <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Kontakti su povezani za <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="contactsJoinedMessage" msgid="3343535986195643136">"Kontakti su objedinjeni"</string>
- <string name="contact_deleted_named_toast" msgid="6558941164987421174">"<xliff:g id="NAME">%s</xliff:g> je izbrisan/a"</string>
+ <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"<xliff:g id="NAME">%1$s</xliff:g> je izbrisan/a"</string>
+ <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"<xliff:g id="NAME_0">%1$s</xliff:g> i <xliff:g id="NAME_1">%2$s</xliff:g> su izbrisani"</string>
+ <string name="contacts_deleted_many_named_toast" msgid="2501253934529429326">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... su izbrisani"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
<item quantity="one">Kontakti su izbrisani</item>
<item quantity="few">Kontakti su izbrisani</item>
@@ -86,10 +91,14 @@
<string name="title_from_google" msgid="4664084747121207202">"Sa Google-a"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Podesi melodiju zvona"</string>
- <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi u govornu poštu"</string>
- <string name="readOnlyContactWarning" msgid="5526727661978307833">"Kontakti sa naloga koji su samo za čitanje ne mogu da se izbrišu, ali mogu da se sakriju."</string>
- <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Sakrij"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Kontakt koji ste izabrali za brisanje sadrži detalje sa više naloga. Detalji sa naloga koji su samo za čitanje će biti skriveni, ali ne i izbrisani."</string>
+ <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Usmeri na govornu poštu"</string>
+ <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Ne usmeravaj na govornu poštu"</string>
+ <!-- no translation found for readOnlyContactWarning (7514475664695089411) -->
+ <skip />
+ <!-- no translation found for readOnlyContactWarning_positive_button (8914797212167683673) -->
+ <skip />
+ <!-- no translation found for readOnlyContactDeleteConfirmation (4717023505914239809) -->
+ <skip />
<string name="single_delete_confirmation" msgid="3106905986948679720">"Želite li da izbrišete ovaj kontakt?"</string>
<string name="batch_delete_confirmation" msgid="3984346060324014108">"Želite li da izbrišete izabrane kontakte?"</string>
<string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Kontakti sa naloga koji su samo za čitanje ne mogu da se izbrišu, ali mogu da se sakriju."</string>
@@ -133,6 +142,13 @@
<string name="groupMembersAddedToast" msgid="4824834898718972768">"Dodato je u oznaku"</string>
<string name="groupSavedErrorToast" msgid="2355891714292740162">"Čuvanje promena oznake nije uspelo"</string>
<string name="groupExistsErrorMessage" msgid="5196811283836946189">"Ta oznaka već postoji"</string>
+ <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Neki kontakti nemaju imejl adresu."</string>
+ <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju broj telefona."</string>
+ <string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji imejl"</string>
+ <string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
+ <!-- no translation found for pickerSelectContactsActivityTitle (1936544190231136729) -->
+ <skip />
+ <string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
<plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> kontakt sa brojem telefona</item>
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> kontakta sa brojevima telefona</item>
@@ -189,7 +205,6 @@
<string name="take_new_photo" msgid="7341354729436576304">"Slikaj novu sliku"</string>
<string name="pick_photo" msgid="2129509985223564942">"Izaberi sliku"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"Izaberite novu sliku"</string>
- <string name="upgrade_in_progress" msgid="474511436863451061">"Kontakt lista se ažurira."</string>
<string name="search_results_searching" msgid="3984833028938569930">"Pretražuje se..."</string>
<string name="menu_display_selected" msgid="6470001164297969034">"Prikaži izabrano"</string>
<string name="menu_display_all" msgid="8887488642609786198">"Prikaži sve"</string>
@@ -248,6 +263,14 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite podrazumevani nalog 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">"Izmeni kontakt"</string>
+ <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo pregled"</string>
+ <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za izmenu"</string>
+ <!-- no translation found for contact_editor_pick_linked_contact_dialog_title (4618465940423857694) -->
+ <skip />
+ <!-- no translation found for contact_editor_add_linked_contact (426142748048816297) -->
+ <skip />
+ <!-- no translation found for contact_editor_unlink_contacts (4525214336177236653) -->
+ <skip />
<string name="add_account" msgid="8201790677994503186">"Dodaj nalog"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj novi nalog"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvezi datoteke baze podataka"</string>
@@ -290,7 +313,7 @@
<string name="editor_change_photo_content_description" msgid="754100561085306263">"Promenite sliku"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"Otvaranje uređivača nije uspelo."</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"Čuva se na"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Gledate"</string>
+ <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"Nije moguće izmeniti kontakt informacije sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
<string name="editor_account_selector_description" msgid="3324358600570627740">"Trenutno se čuva na <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Dodirnite dvaput da biste izabrali drugi nalog."</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
<item quantity="one">Objedinjeni kontakti (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -330,14 +353,15 @@
<string name="photo_view_description_checked" msgid="3906597168607472795">"Slika sa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> naloga <xliff:g id="USER_NAME">%s </xliff:g> je označena"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Slika sa nepoznatog naloga nije označena"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Slika sa nepoznatog naloga je označena"</string>
- <string name="locale_change_in_progress" msgid="6975676844194755501">"Lista kontakata se ažurira da bi se primenila promena jezika.\n\nSačekajte…"</string>
- <string name="menu_duplicates" msgid="4129802988372197257">"Duplikati"</string>
+ <string name="menu_assistant" msgid="5760693735722052454">"Predlozi"</string>
+ <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Novo"</string>
<string name="navigation_drawer_open" msgid="1126498472143250642">"Otvori fioku za navigaciju"</string>
<string name="navigation_drawer_close" msgid="4137416137011817930">"Zatvori fioku za navigaciju"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Oznake"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Nalozi"</string>
<string name="permission_explanation_header" msgid="5739405825039695327">"Pregledajte istoriju zajedno"</string>
- <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Događaji i poruke"</string>
+ <!-- no translation found for permission_explanation_subheader_calendar_and_SMS (5411144298889835768) -->
+ <skip />
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Događaji"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Poruke"</string>
<string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Organizujte listu"</string>
@@ -486,10 +510,21 @@
<string name="menu_doNotSave" msgid="58593876893538465">"Otkaži"</string>
<string name="listCustomView" msgid="1840624396582117590">"Prilagođeni prikaz"</string>
<string name="dialog_new_contact_account" msgid="4969619718062454756">"Sačuvajte uvezene kontakte na:"</string>
- <string name="import_from_sim" msgid="3859272228033941659">"Uvezi sa SIM kartice"</string>
- <string name="import_from_sim_summary" msgid="5815105584445743740">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
- <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
- <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Uvezi iz .vcf datoteke"</string>
+ <string name="import_from_sim" msgid="6912071635295799131">"Sa SIM kartice"</string>
+ <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"Sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+ <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+ <item quantity="one">%1$d kontakt</item>
+ <item quantity="few">%1$d kontakta</item>
+ <item quantity="other">%1$d kontakata</item>
+ </plurals>
+ <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+ <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> kontakt • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> kontakta • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> kontakata • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ </plurals>
+ <string name="import_from_vcf_file" product="default" msgid="8662528435646418203">"Iz .vcf datoteke"</string>
+ <string name="nothing_to_import_message" msgid="1651921906873335656">"Nema ničega za uvoz"</string>
+ <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Želite da uvezete kontakte iz vCard datoteke?"</string>
<string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Želite li da otkažete uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Želite li da otkažete izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nije moguće otkazati vCard uvoz/izvoz"</string>
@@ -546,8 +581,6 @@
<string name="display_options_view_family_name_first" msgid="956445100777296467">"Prvo prezime"</string>
<string name="settings_accounts" msgid="350219740670774576">"Nalozi"</string>
<string name="default_editor_account" msgid="699591683362420991">"Podrazumevani nalog za nove kontakte"</string>
- <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Sinhronizuj metapodatke kontakata [DOGFOOD]"</string>
- <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Sinhronizujte metapodatke kontakata"</string>
<string name="settings_my_info_title" msgid="1534272456405343119">"Moje informacije"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Podesite profil"</string>
<string name="setting_about" msgid="7014388749752042863">"O Kontaktima"</string>
@@ -557,7 +590,7 @@
<string name="share_contacts" msgid="8109287987498711664">"Deli sve kontakte"</string>
<string name="share_contacts_failure" msgid="1216431977330560559">"Deljenje kontakata nije uspelo."</string>
<string name="dialog_export" msgid="1628001095187741417">"Izvezite kontakte"</string>
- <string name="dialog_import" msgid="2431698729761448759">"Uvoz kontakata"</string>
+ <string name="dialog_import" msgid="2423592905927819672">"Uvezite kontakte"</string>
<string name="share_error" msgid="948429331673358107">"Ovaj kontakt ne može da se deli."</string>
<string name="no_contact_to_share" msgid="1276397530378323033">"Nema kontakata za deljenje."</string>
<string name="menu_search" msgid="9147752853603483719">"Pretraga"</string>
@@ -609,4 +642,27 @@
<string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> s <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ova prečica je onemogućena"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt je uklonjen"</string>
+ <string name="sim_import_button_text" msgid="4270841592496619317">"Uvezi"</string>
+ <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Izaberite kontakte"</string>
+ <string name="sim_import_title_some_selected_fmt" msgid="2978159841027256106">"Izabrali ste <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="sim_import_empty_message" msgid="7743815244380189651">"Nema kontakata na SIM kartici"</string>
+ <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Kontakt je već na listi"</string>
+ <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+ <item quantity="one">Uvezen je <xliff:g id="COUNT">%d</xliff:g> kontakt sa SIM kartice</item>
+ <item quantity="few">Uvezena su <xliff:g id="COUNT">%d</xliff:g> kontakta sa SIM kartice</item>
+ <item quantity="other">Uvezeno je <xliff:g id="COUNT">%d</xliff:g> kontakata sa SIM kartice</item>
+ </plurals>
+ <string name="sim_import_failed_toast" msgid="5559267299793622705">"Uvoz kontakata sa SIM kartice nije uspeo"</string>
+ <string name="sim_import_dialog_title" msgid="6699935401502172530">"Izaberite kontakte za uvoz"</string>
+ <string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Otkažite uvoz"</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"Automatska sinhronizacija je isključena. Dodirnite da biste je uključili."</string>
+ <string name="dismiss_sync_alert" msgid="8941131776605093596">"Odbacite"</string>
+ <string name="account_sync_off" msgid="7646143254066243924">"Sinhronizacija naloga je isključena. Dodirnite da biste je uključili."</string>
+ <!-- no translation found for turn_auto_sync_on_dialog_title (333965456829670541) -->
+ <skip />
+ <!-- no translation found for turn_auto_sync_on_dialog_body (5025336917533693997) -->
+ <skip />
+ <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Uključi"</string>
+ <string name="connection_error_message" msgid="7046408921529247089">"Veza nije uspostavljena"</string>
+ <string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index c63f68f..ba2ee99 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -40,7 +40,7 @@
<string name="menu_editContact" msgid="9042415603857662633">"Рэдагаваць"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Выдаліць"</string>
<string name="menu_change_photo" msgid="7769177631511496210">"Змяніць фота"</string>
- <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Размясціць на галоўным экране"</string>
+ <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Стварыць ярлык"</string>
<string name="menu_call" msgid="3992595586042260618">"Выклікаць кантакт"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Паведамленне кантакту"</string>
<string name="menu_splitAggregate" msgid="2627252205317945563">"Выдаліць сувязь"</string>
@@ -60,14 +60,19 @@
<string name="joinConfirmation" msgid="8262614843581924365">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і спасылку на выбраны кантакт?"</string>
<string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Захаваць і звязаць"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Звязаць"</string>
+ <!-- no translation found for menu_linkedContacts (400444389718855621) -->
+ <skip />
<string name="menu_save" msgid="1727844363591825909">"Захаваць"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Звязаць кантакты"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Выберыце кантакт, які хочаце звязаць з iмем <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Паказаць усе кантакты"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Прапанаваныя кантакты"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Усе кантакты"</string>
+ <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Звязаны <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="contactsJoinedMessage" msgid="3343535986195643136">"Кантакты звязаны"</string>
- <string name="contact_deleted_named_toast" msgid="6558941164987421174">"Карыстальнік <xliff:g id="NAME">%s</xliff:g> выдалены"</string>
+ <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> выдалены"</string>
+ <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Карыстальнікі <xliff:g id="NAME_0">%1$s</xliff:g> і <xliff:g id="NAME_1">%2$s</xliff:g> выдалены"</string>
+ <string name="contacts_deleted_many_named_toast" msgid="2501253934529429326">"Карыстальнікі <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... выдалены"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
<item quantity="one">Кантакты выдалены</item>
<item quantity="few">Кантакты выдалены</item>
@@ -89,10 +94,14 @@
<string name="title_from_google" msgid="4664084747121207202">"З Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"З <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Задаць рынгтон"</string>
- <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Усе выклікі на галасавую пошту"</string>
- <string name="readOnlyContactWarning" msgid="5526727661978307833">"Кантакты з уліковых запісаў, даступных толькі для чытання, нельга выдаліць, але іх можна схаваць."</string>
- <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Схаваць"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Кантакт на выдаленне мае інфармацыю з некалькіх уліковых запісаў. Інфармацыя з уліковых запісаў, даступных толькі для чытання, будзе схавана, а не выдалена."</string>
+ <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Накіроўваць на галасавую пошту"</string>
+ <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Адм. накірав. на галас. пошту"</string>
+ <!-- no translation found for readOnlyContactWarning (7514475664695089411) -->
+ <skip />
+ <!-- no translation found for readOnlyContactWarning_positive_button (8914797212167683673) -->
+ <skip />
+ <!-- no translation found for readOnlyContactDeleteConfirmation (4717023505914239809) -->
+ <skip />
<string name="single_delete_confirmation" msgid="3106905986948679720">"Выдаліць гэты кантакт?"</string>
<string name="batch_delete_confirmation" msgid="3984346060324014108">"Выдаліць выбраныя кантакты?"</string>
<string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Кантакты з уліковых запісаў, даступных толькі для чытання, нельга выдаліць, але іх можна схаваць."</string>
@@ -136,6 +145,13 @@
<string name="groupMembersAddedToast" msgid="4824834898718972768">"Дададзена да этыкеткі"</string>
<string name="groupSavedErrorToast" msgid="2355891714292740162">"Не ўдалося захаваць змяненні меткі"</string>
<string name="groupExistsErrorMessage" msgid="5196811283836946189">"Гэта пазнака ўжо існуе"</string>
+ <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Некаторыя кантакты не маюць адрасоў электр. пошты."</string>
+ <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Некаторыя кантакты не маюць нумароў тэлефона."</string>
+ <string name="menu_sendEmailOption" msgid="5978319931321657780">"Адправіць электронны ліст"</string>
+ <string name="menu_sendMessageOption" msgid="8850168125274916426">"Адправіць паведамленне"</string>
+ <!-- no translation found for pickerSelectContactsActivityTitle (1936544190231136729) -->
+ <skip />
+ <string name="send_to_selection" msgid="2251339182881603540">"Адправіць"</string>
<plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> кантакт з нумарам(і) тэлефона(ў)</item>
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> кантакты з нумарамі тэлефонаў</item>
@@ -196,7 +212,6 @@
<string name="take_new_photo" msgid="7341354729436576304">"Зрабiце новую фатаграфію"</string>
<string name="pick_photo" msgid="2129509985223564942">"Выбраць фота"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"Выбраць новае фота"</string>
- <string name="upgrade_in_progress" msgid="474511436863451061">"Спiс кантактаў абнаўляецца."</string>
<string name="search_results_searching" msgid="3984833028938569930">"Пошук..."</string>
<string name="menu_display_selected" msgid="6470001164297969034">"Паказаць выбраныя"</string>
<string name="menu_display_all" msgid="8887488642609786198">"Паказаць усіх"</string>
@@ -255,6 +270,14 @@
<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>
+ <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Толькі прагляд"</string>
+ <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Выбраць кантакт для рэдагавання"</string>
+ <!-- no translation found for contact_editor_pick_linked_contact_dialog_title (4618465940423857694) -->
+ <skip />
+ <!-- no translation found for contact_editor_add_linked_contact (426142748048816297) -->
+ <skip />
+ <!-- no translation found for contact_editor_unlink_contacts (4525214336177236653) -->
+ <skip />
<string name="add_account" msgid="8201790677994503186">"Дадаць уліковы запіс"</string>
<string name="add_new_account" msgid="5748627740680940264">"Дадаць новы ўліковы запіс"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Экспарт базы дадзеных файлаў"</string>
@@ -295,10 +318,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_read_only_title" msgid="4137969650184457126">"Кантактную інфармацыю з <xliff:g id="ACCOUNT">%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="few">Звязаныя кантакты (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -341,14 +364,15 @@
<string name="photo_view_description_checked" msgid="3906597168607472795">"Фота з уліковага запісу <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>пазначана"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Фота з невядомага ўліковага запісу не пазначана"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Пазначана фота з невядомага ўліковага запісу"</string>
- <string name="locale_change_in_progress" msgid="6975676844194755501">"Спіс кантактаў абнаўляецца, каб адлюстраваць змяненне мовы.\n\nПачакайце..."</string>
- <string name="menu_duplicates" msgid="4129802988372197257">"Дублікаты"</string>
+ <string name="menu_assistant" msgid="5760693735722052454">"Прапановы"</string>
+ <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Новыя"</string>
<string name="navigation_drawer_open" msgid="1126498472143250642">"Адкрыць высоўнае меню навігацыі"</string>
<string name="navigation_drawer_close" msgid="4137416137011817930">"Закрыць высоўнае меню навігацыi"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Меткі"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Уліковыя запісы"</string>
<string name="permission_explanation_header" msgid="5739405825039695327">"Праглядайце сваю гісторыю разам"</string>
- <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Падзеі і паведамленні"</string>
+ <!-- no translation found for permission_explanation_subheader_calendar_and_SMS (5411144298889835768) -->
+ <skip />
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Падзеі"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Паведамленні"</string>
<string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Арганізуйце свой спіс"</string>
@@ -497,10 +521,23 @@
<string name="menu_doNotSave" msgid="58593876893538465">"Адмена"</string>
<string name="listCustomView" msgid="1840624396582117590">"Карыстальніцкі выгляд"</string>
<string name="dialog_new_contact_account" msgid="4969619718062454756">"Захаваць імпартаваныя кантакты ў:"</string>
- <string name="import_from_sim" msgid="3859272228033941659">"Імпарт з SIM-карты"</string>
- <string name="import_from_sim_summary" msgid="5815105584445743740">"Імпартаваць з SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
- <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Імпартаваць з SIM-карты <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
- <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Імпартаваць з файла .vcf"</string>
+ <string name="import_from_sim" msgid="6912071635295799131">"SIM-карта"</string>
+ <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM-карта <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+ <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+ <item quantity="one">%1$d кантакт</item>
+ <item quantity="few">%1$d кантакты</item>
+ <item quantity="many">%1$d кантактаў</item>
+ <item quantity="other">%1$d кантакту</item>
+ </plurals>
+ <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+ <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> кантакт • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> кантакты • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">^1</xliff:g> кантактаў • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> кантакту • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ </plurals>
+ <string name="import_from_vcf_file" product="default" msgid="8662528435646418203">"Файл .vcf"</string>
+ <string name="nothing_to_import_message" msgid="1651921906873335656">"Няма што імпартаваць"</string>
+ <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Імпартаваць кантакты з vCard?"</string>
<string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Адмянiць iмпарт файла <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Адмянiць экспарт файла <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Немагчыма адмяніць імпарт/экспарт vCard"</string>
@@ -557,8 +594,6 @@
<string name="display_options_view_family_name_first" msgid="956445100777296467">"Спачатку прозвішча"</string>
<string name="settings_accounts" msgid="350219740670774576">"Уліковыя запісы"</string>
<string name="default_editor_account" msgid="699591683362420991">"Стандартны ўліковы запіс для новых кантактаў"</string>
- <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Сінхранізаваць метаданыя кантактаў [DOGFOOD]"</string>
- <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Сінхранізаваць метаданыя кантактаў"</string>
<string name="settings_my_info_title" msgid="1534272456405343119">"Мая інфармацыя"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Наладзьце ваш профіль"</string>
<string name="setting_about" msgid="7014388749752042863">"Інфармацыя аб Кантактах"</string>
@@ -568,7 +603,7 @@
<string name="share_contacts" msgid="8109287987498711664">"Абагуліць усе кантакты"</string>
<string name="share_contacts_failure" msgid="1216431977330560559">"Збой абагульвання кантактаў."</string>
<string name="dialog_export" msgid="1628001095187741417">"Экспартаваць кантакты"</string>
- <string name="dialog_import" msgid="2431698729761448759">"Імпартаваць кантакты"</string>
+ <string name="dialog_import" msgid="2423592905927819672">"Імпартаваць кантакты з"</string>
<string name="share_error" msgid="948429331673358107">"Нельга падзялiцца гэтым кантактам."</string>
<string name="no_contact_to_share" msgid="1276397530378323033">"Няма кантактаў, якія можна абагуліць."</string>
<string name="menu_search" msgid="9147752853603483719">"Пошук"</string>
@@ -621,4 +656,28 @@
<string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> гадз <xliff:g id="MINUTES_1">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Гэта спалучэнне клавіш было адключана"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Кантакт быў выдалены"</string>
+ <string name="sim_import_button_text" msgid="4270841592496619317">"Імпартаваць"</string>
+ <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Выберыце кантакты"</string>
+ <string name="sim_import_title_some_selected_fmt" msgid="2978159841027256106">"Выбрана: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="sim_import_empty_message" msgid="7743815244380189651">"На вашай SIM-карце няма кантактаў"</string>
+ <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Кантакт ужо ёсць у вашым спісе"</string>
+ <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+ <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> кантакт SIM-карты імпартаваны</item>
+ <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> кантакты SIM-карты імпартаваны</item>
+ <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> кантактаў SIM-карты імпартаваны</item>
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> кантакту SIM-карты імпартавана</item>
+ </plurals>
+ <string name="sim_import_failed_toast" msgid="5559267299793622705">"Памылка імпарту кантактаў SIM-карты"</string>
+ <string name="sim_import_dialog_title" msgid="6699935401502172530">"Выберыце кантакты для імпарту"</string>
+ <string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Скасаваць імпартаванне"</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"Аўтасінхранізацыя адключана. Дакраніцеся, каб уключыць яе."</string>
+ <string name="dismiss_sync_alert" msgid="8941131776605093596">"Адхіліць"</string>
+ <string name="account_sync_off" msgid="7646143254066243924">"Сінхранізацыя ўліковага запісу адключана. Дакраніцеся, каб уключыць яе."</string>
+ <!-- no translation found for turn_auto_sync_on_dialog_title (333965456829670541) -->
+ <skip />
+ <!-- no translation found for turn_auto_sync_on_dialog_body (5025336917533693997) -->
+ <skip />
+ <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Уключыць"</string>
+ <string name="connection_error_message" msgid="7046408921529247089">"Няма падключэння"</string>
+ <string name="single_sim_display_label" msgid="6985770499439371497">"SIM-карта"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 664faed..8ed2c9d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 контакт в SIM картата бе импортиран</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Импортирането на контактите в SIM картата не бе успешно"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Влизането в профила не бе възможно"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Избиране на контакти за импортиране"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Анулиране на импортирането"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автоматичното синхронизиране е изключено. Докоснете, за да включите."</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 8a31594..4eb5594 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other">SIM কার্ডে থাকা <xliff:g id="COUNT">%d</xliff:g>টি পরিচিতি আমদানি করা হয়েছে</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM কার্ডে থাকা পরিচিতিগুলি আমদানি করা গেল না"</string>
- <string name="connection_failed" msgid="7558253972301525402">"সাইন ইন করা গেল না"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"আমদানি করতে পরিচিতিগুলি নির্বাচন করুন"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"আমদানি বাতিল করুন"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"স্বতঃ-সিঙ্ক বন্ধ আছে৷ চালু করতে আলতো চাপ দিন৷"</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 6667bb3..c5e2b26 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -40,7 +40,7 @@
<string name="menu_editContact" msgid="9042415603857662633">"Uredi"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
<string name="menu_change_photo" msgid="7769177631511496210">"Promijeni fotografiju"</string>
- <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Postavi na Početni ekran"</string>
+ <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Napravi prečicu"</string>
<string name="menu_call" msgid="3992595586042260618">"Pozovi kontakt"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Pošalji tekstualnu poruku kontaktu"</string>
<string name="menu_splitAggregate" msgid="2627252205317945563">"Razdvoji"</string>
@@ -60,14 +60,19 @@
<string name="joinConfirmation" msgid="8262614843581924365">"Želite li sačuvati promjene koje ste već načinili i povezati s odabranim kontaktom?"</string>
<string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Sačuvaj i poveži"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Poveži"</string>
+ <!-- no translation found for menu_linkedContacts (400444389718855621) -->
+ <skip />
<string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Poveži kontakte"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži sve kontakte"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
+ <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> je povezan"</string>
<string name="contactsJoinedMessage" msgid="3343535986195643136">"Kontakti su povezani"</string>
- <string name="contact_deleted_named_toast" msgid="6558941164987421174">"Kontakt <xliff:g id="NAME">%s</xliff:g> je izbrisan"</string>
+ <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Kontakt <xliff:g id="NAME">%1$s</xliff:g> je izbrisan"</string>
+ <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Kontakti <xliff:g id="NAME_0">%1$s</xliff:g> i <xliff:g id="NAME_1">%2$s</xliff:g> su izbrisani"</string>
+ <string name="contacts_deleted_many_named_toast" msgid="2501253934529429326">"Kontakti <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... su izbrisani"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
<item quantity="one">Kontakti su izbrisani</item>
<item quantity="few">Kontakti su izbrisani</item>
@@ -86,10 +91,14 @@
<string name="title_from_google" msgid="4664084747121207202">"Sa Googlea"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Sa računa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Postavi zvono"</string>
- <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi na govornu poštu"</string>
- <string name="readOnlyContactWarning" msgid="5526727661978307833">"Kontakti s računa koji su samo za čitanje se ne mogu izbrisati, ali se mogu sakriti."</string>
- <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Sakrij"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Kontakt kojeg želite izbrisati sadrži detalje s više računa. Detalji s računa koji su samo za čitanje se neće izbrisati, već sakriti."</string>
+ <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Preusmjeri na govornu poštu"</string>
+ <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Poništi preusmj. na gov. poštu"</string>
+ <!-- no translation found for readOnlyContactWarning (7514475664695089411) -->
+ <skip />
+ <!-- no translation found for readOnlyContactWarning_positive_button (8914797212167683673) -->
+ <skip />
+ <!-- no translation found for readOnlyContactDeleteConfirmation (4717023505914239809) -->
+ <skip />
<string name="single_delete_confirmation" msgid="3106905986948679720">"Izbrisati ovaj kontakt?"</string>
<string name="batch_delete_confirmation" msgid="3984346060324014108">"Izbrisati odabrane kontakte?"</string>
<string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Kontakti s računa koji su samo za čitanje se ne mogu izbrisati, ali se mogu sakriti."</string>
@@ -133,6 +142,13 @@
<string name="groupMembersAddedToast" msgid="4824834898718972768">"Dodano oznaci"</string>
<string name="groupSavedErrorToast" msgid="2355891714292740162">"Nije moguće sačuvati promjene oznake"</string>
<string name="groupExistsErrorMessage" msgid="5196811283836946189">"Ta oznaka već postoji"</string>
+ <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Neki kontakti nemaju adrese e-pošte."</string>
+ <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju brojeve telefona."</string>
+ <string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji poruku e-pošte"</string>
+ <string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
+ <!-- no translation found for pickerSelectContactsActivityTitle (1936544190231136729) -->
+ <skip />
+ <string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
<plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> kontakt s brojem telefona</item>
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> kontakta s brojevima telefona</item>
@@ -189,7 +205,6 @@
<string name="take_new_photo" msgid="7341354729436576304">"Snimi novu fotografiju"</string>
<string name="pick_photo" msgid="2129509985223564942">"Izaberi fotografiju"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"Odaberi novu fotografiju"</string>
- <string name="upgrade_in_progress" msgid="474511436863451061">"Lista kontakata se ažurira."</string>
<string name="search_results_searching" msgid="3984833028938569930">"Pretraživanje…"</string>
<string name="menu_display_selected" msgid="6470001164297969034">"Prikaži odabrane"</string>
<string name="menu_display_all" msgid="8887488642609786198">"Prikaži sve"</string>
@@ -248,6 +263,14 @@
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite 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>
+ <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo prikaz"</string>
+ <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za uređivanje"</string>
+ <!-- no translation found for contact_editor_pick_linked_contact_dialog_title (4618465940423857694) -->
+ <skip />
+ <!-- no translation found for contact_editor_add_linked_contact (426142748048816297) -->
+ <skip />
+ <!-- no translation found for contact_editor_unlink_contacts (4525214336177236653) -->
+ <skip />
<string name="add_account" msgid="8201790677994503186">"Dodajte račun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj novi račun"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvezi fajlove baze podataka"</string>
@@ -290,7 +313,7 @@
<string name="editor_change_photo_content_description" msgid="754100561085306263">"Promijeni fotografiju"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"Otvaranje uređivača nije uspjelo."</string>
<string name="editor_account_selector_title" msgid="4426337993307015833">"Sačuvaj na"</string>
- <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Prikazuje se"</string>
+ <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"Informacije o kontaktu s <xliff:g id="ACCOUNT">%s</xliff:g> nije moguće uređivati"</string>
<string name="editor_account_selector_description" msgid="3324358600570627740">"Trenutno se sprema na račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Dodirnite dvaput da izaberete drugi račun."</string>
<plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
<item quantity="one">Povezani kontakti (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -330,14 +353,15 @@
<string name="photo_view_description_checked" msgid="3906597168607472795">"Fotografija s računa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>je označena"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotografija s nepoznatog računa nije označena"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotografija s nepoznatog računa je označena"</string>
- <string name="locale_change_in_progress" msgid="6975676844194755501">"Lista kontakata se ažurira u skladu s promjenom jezika.\n\nPričekajte…"</string>
- <string name="menu_duplicates" msgid="4129802988372197257">"Duplikati"</string>
+ <string name="menu_assistant" msgid="5760693735722052454">"Prijedlozi"</string>
+ <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Novo"</string>
<string name="navigation_drawer_open" msgid="1126498472143250642">"Otvori panel za navigaciju"</string>
<string name="navigation_drawer_close" msgid="4137416137011817930">"Zatvori panel za navigaciju"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Oznake"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Računi"</string>
<string name="permission_explanation_header" msgid="5739405825039695327">"Pogledajte historiju kalendara i SMS-a"</string>
- <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Događaji i poruke"</string>
+ <!-- no translation found for permission_explanation_subheader_calendar_and_SMS (5411144298889835768) -->
+ <skip />
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Događaji"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Poruke"</string>
<string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Organizirajte spisak"</string>
@@ -486,10 +510,21 @@
<string name="menu_doNotSave" msgid="58593876893538465">"Otkaži"</string>
<string name="listCustomView" msgid="1840624396582117590">"Prilagođeni prikaz"</string>
<string name="dialog_new_contact_account" msgid="4969619718062454756">"Sačuvaj uvezene kontakte na karticu:"</string>
- <string name="import_from_sim" msgid="3859272228033941659">"Uvezi sa SIM kartice"</string>
- <string name="import_from_sim_summary" msgid="5815105584445743740">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
- <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
- <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Uvezi iz .vcf fajla"</string>
+ <string name="import_from_sim" msgid="6912071635295799131">"SIM kartice"</string>
+ <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+ <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+ <item quantity="one">%1$d kontakt</item>
+ <item quantity="few">%1$d kontakta</item>
+ <item quantity="other">%1$d kontakata</item>
+ </plurals>
+ <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+ <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> kontakt • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> kontakta • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> kontakata • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ </plurals>
+ <string name="import_from_vcf_file" product="default" msgid="8662528435646418203">".vcf fajla"</string>
+ <string name="nothing_to_import_message" msgid="1651921906873335656">"Nema ništa za uvoz"</string>
+ <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Uvesti kontakte iz vCard fajla?"</string>
<string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Otkazati uvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Otkazati izvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nemoguće otkazati uvoz/izvoz vCard fajla"</string>
@@ -546,8 +581,6 @@
<string name="display_options_view_family_name_first" msgid="956445100777296467">"Prezime prvo"</string>
<string name="settings_accounts" msgid="350219740670774576">"Računi"</string>
<string name="default_editor_account" msgid="699591683362420991">"Zadani račun za nove kontakte"</string>
- <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Sinhroniziraj metapodatke kontakata [DOGFOOD]"</string>
- <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Sinhroniziraj metapodatke kontakata"</string>
<string name="settings_my_info_title" msgid="1534272456405343119">"Moje informacije"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Postavite svoj profil"</string>
<string name="setting_about" msgid="7014388749752042863">"O kontaktima"</string>
@@ -557,7 +590,7 @@
<string name="share_contacts" msgid="8109287987498711664">"Dijeli sve kontakte"</string>
<string name="share_contacts_failure" msgid="1216431977330560559">"Dijeljenje kontakata nije uspjelo."</string>
<string name="dialog_export" msgid="1628001095187741417">"Izvezi kontakte"</string>
- <string name="dialog_import" msgid="2431698729761448759">"Uvezi kontakte"</string>
+ <string name="dialog_import" msgid="2423592905927819672">"Uvezi kontakte sa"</string>
<string name="share_error" msgid="948429331673358107">"Ovaj kontakt se ne može podijeliti."</string>
<string name="no_contact_to_share" msgid="1276397530378323033">"Nema kontakata za dijeljenje."</string>
<string name="menu_search" msgid="9147752853603483719">"Traži"</string>
@@ -609,4 +642,27 @@
<string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ova prečica je onemogućena"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt je uklonjen"</string>
+ <string name="sim_import_button_text" msgid="4270841592496619317">"Uvezi"</string>
+ <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Odaberite kontakte"</string>
+ <string name="sim_import_title_some_selected_fmt" msgid="2978159841027256106">"Odabrano: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="sim_import_empty_message" msgid="7743815244380189651">"Nema kontakata na SIM kartici"</string>
+ <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Kontakt se već nalazi na listi"</string>
+ <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+ <item quantity="one">Uvezen je <xliff:g id="COUNT">%d</xliff:g> kontakt sa SIM kartice</item>
+ <item quantity="few">Uvezena su <xliff:g id="COUNT">%d</xliff:g> kontakta sa SIM kartice</item>
+ <item quantity="other">Uvezeno je <xliff:g id="COUNT">%d</xliff:g> kontakata sa SIM kartice</item>
+ </plurals>
+ <string name="sim_import_failed_toast" msgid="5559267299793622705">"Uvoz kontakata sa SIM kartice nije uspio"</string>
+ <string name="sim_import_dialog_title" msgid="6699935401502172530">"Odaberite kontakte za uvoz"</string>
+ <string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Otkaži uvoz"</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"Automatska sinhronizacija je isključena. Dodirnite da je uključite."</string>
+ <string name="dismiss_sync_alert" msgid="8941131776605093596">"Odbaci"</string>
+ <string name="account_sync_off" msgid="7646143254066243924">"Sinhronizacija računa je isključena. Dodirnite da je uključite."</string>
+ <!-- no translation found for turn_auto_sync_on_dialog_title (333965456829670541) -->
+ <skip />
+ <!-- no translation found for turn_auto_sync_on_dialog_body (5025336917533693997) -->
+ <skip />
+ <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Uključi"</string>
+ <string name="connection_error_message" msgid="7046408921529247089">"Niste povezani na mrežu"</string>
+ <string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 97b9c48..227bd99 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">S\'ha importat 1 contacte de la SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"No s\'han pogut importar els contactes de la SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"No s\'ha pogut iniciar la sessió"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Selecciona contactes per importar-los"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancel·la la importació"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La sincronització automàtica està desactivada. Toca per activar-la."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index af2ba23..0386f4c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -668,7 +668,6 @@
<item quantity="one">Byl importován 1 kontakt ze SIM karty</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kontakty ze SIM karty se nepodařilo importovat"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Přihlášení se nezdařilo"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Vyberte kontakty na import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Zrušit import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatická synchronizace je vypnutá. Zapnete ji klepnutím."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1975c83..487f243 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> kontaktpersoner på SIM-kortet blev importeret</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kontaktpersonerne på SIM-kortet kan ikke importeres"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Der kan ikke logges ind"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Vælg kontakter, der skal importeres"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Annuller import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatisk synkronisering er slået fra. Tryk for at slå funktionen til."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 77d2ae1..8b1f125 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM-Kontakt importiert</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Fehler beim Importieren von SIM-Kontakten"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Fehler bei der Anmeldung"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Kontakte für Import auswählen"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Import abbrechen"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Die automatische Synchronisierung ist deaktiviert. Zum Aktivieren hier tippen."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e2ee5c9..e82f090 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Έγινε εισαγωγή 1 επαφής από τη SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Απέτυχε η εισαγωγή των επαφών από τη SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Αποτυχία σύνδεσης"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Επιλέξτε επαφές για εισαγωγή"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Ακύρωση εισαγωγής"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Ο αυτόματος συγχρονισμός είναι ανενεργός. Πατήστε για να τον ενεργοποιήσετε."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 86ed1df..dafba11 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM contact imported</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Failed to import SIM contacts"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Failed to sign in"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Select contacts to import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancel import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Auto-sync is off. Tap to turn on."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 86ed1df..dafba11 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM contact imported</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Failed to import SIM contacts"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Failed to sign in"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Select contacts to import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancel import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Auto-sync is off. Tap to turn on."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 86ed1df..dafba11 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM contact imported</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Failed to import SIM contacts"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Failed to sign in"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Select contacts to import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancel import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Auto-sync is off. Tap to turn on."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd47ca9..896e63c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Se importó 1 contacto de la SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"No se pudieron importar los contactos de la SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"No se pudo acceder"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Seleccionar contactos para importar"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importación"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La sincronización automática está desactivada. Presiona para activarla."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ab571e2..85f07d0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Se ha importado 1 contacto de la SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"No se han podido importar los contactos de la SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"No se ha podido iniciar sesión"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Seleccionar contactos para importarlos"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importación"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La sincronización automática está desactivada. Toca para activarla."</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 769bb82..d38bbb2 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM-kaardi kontakt imporditi</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM-kaardi kontaktide importimine ebaõnnestus"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Sisselogimine ebaõnnestus"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Valige imporditavad kontaktid"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Impordi tühistamine"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automaatne sünkroonimine on välja lülitatud. Puudutage sisselülitamiseks."</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 5d5942e..f0a1b80 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">SIM txarteleko 1 kontaktu inportatu da</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ezin izan dira inportatu SIM txarteleko kontaktuak"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Ezin izan da hasi saioa"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Hautatu inportatu beharreko kontaktuak"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Utzi inportazioa bertan behera"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Desaktibatuta dago sinkronizazio automatikoa. Sakatu aktibatzeko."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c86d662..4c46e16 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> مخاطب سیم کارت وارد شد</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"مخاطبین سیم کارت وارد نشدند"</string>
- <string name="connection_failed" msgid="7558253972301525402">"وارد سیستم نشدید"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"انتخاب مخاطبین برای وارد کردن"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"لغو وارد کردن"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"همگامسازی خودکار غیرفعال است. برای فعال کردن ضربه بزنید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bfdcaf7..77e692f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Yksi SIM-yhteystieto tuotiin.</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM-yhteystietojen tuonti epäonnistui."</string>
- <string name="connection_failed" msgid="7558253972301525402">"Kirjautuminen epäonnistui"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Valitse tuotavat yhteystiedot"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Peruuta tuonti"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automaattinen synkronointi ei ole käytössä. Ota toiminto käyttöön napauttamalla."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d737062..8727247 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contacts importés de la carte SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Échec de l\'importation des contacts de la carte SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Échec de la connexion"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Sélectionner les contacts à importer"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Annuler l\'importation"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La synchronisation automatique est désactivée. Touchez ici pour l\'activer."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index eadef7b..adc73f3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contacts importés depuis la carte SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Impossible d\'importer les contacts de la carte SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Connexion impossible"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Sélectionner les contacts à importer"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Annuler l\'importation"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La synchronisation automatique est désactivée. Appuyez pour l\'activer."</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index e338859..b195959 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Importouse 1 contacto da SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Produciuse un erro ao importar contactos da SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Produciuse un erro ao iniciar sesión"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Seleccionar contactos para importar"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importación"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"A sincronización automática está desactivada. Toca para activala."</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 2c2d0dd..fcbcb27 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> SIM સંપર્કો આયાત કર્યાં</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM સંપર્કો આયાત કરવામાં નિષ્ફળ થયાં"</string>
- <string name="connection_failed" msgid="7558253972301525402">"સાઇન ઇન કરવામાં નિષ્ફળ થયાં"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"આયાત કરવા માટે સંપર્કો પસંદ કરો"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"આયાત કરવાનું રદ કરો"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"સ્વતઃ સમન્વયન બંધ છે. ચાલુ કરવા માટે ટૅપ કરો."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6458e84..7168d7d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> सिम संपर्क आयात किए गए</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"सिम संपर्कों को आयात करने में विफल रहा"</string>
- <string name="connection_failed" msgid="7558253972301525402">"प्रवेश करने में विफल रहे"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"आयात करने के लिए संपर्कों को चुनें"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"आयात रद्द करें"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"स्वतः समन्वयन बंद है. चालू करने के लिए टैप करें."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b898bef..1559212 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -653,7 +653,6 @@
<item quantity="other">Uvezeno je <xliff:g id="COUNT">%d</xliff:g> kontakata sa SIM-a</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Uvoz kontakata sa SIM kartice nije uspio"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Prijava nije uspjela"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Odabir kontakata za uvoz"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Otkazivanje uvoza"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatska sinkronizacija je isključena. Dodirnite da biste je uključili."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1a5e327..d2b89be 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM-névjegy importálva</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Nem sikerült importálni a SIM-névjegyeket."</string>
- <string name="connection_failed" msgid="7558253972301525402">"Sikertelen bejelentkezés"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Válassza ki az importálni kívánt névjegyeket"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Importálás leállítása"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Az automatikus szinkronizálás ki van kapcsolva. Koppintson a bekapcsolásához."</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 1e67022..fa6f938 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> կոնտակտ SIM քարտից ներմուծվեց</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM քարտից չհաջողվեց ներմուծել կոնտակտները"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Չհաջողվեց մուտք գործել"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Ընտրեք կոնտակտներ ներմուծման համար"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Չեղարկել ներմուծումը"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Հպեք՝ հաշվի ինքնահամաժամեցումը միացնելու համար:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c0e2677..823708b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 kontak SIM yang diimpor</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Gagal mengimpor kontak SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Gagal masuk"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Pilih kontak untuk diimpor"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Batalkan impor"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Sinkronisasi otomatis tidak aktif. Tap untuk mengaktifkan."</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 9dcc7e7..c76ed0b 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> SIM-tengiliðir fluttir inn</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ekki tókst að flytja inn SIM-tengiliðina"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Innskráning tókst ekki"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Veldu tengiliði til að flytja inn"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Hætta við innflutning"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Slökkt er á sjálfvirkri samstillingu. Ýttu til að kveikja á henni."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 881ee0f..6058993 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 contatto della SIM importato</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Impossibile importare i contatti della SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Impossibile accedere"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Seleziona contatti da importare"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Annulla importazione"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"La sincronizzazione automatica è disattivata. Tocca per attivarla."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2063e79..1e937d1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -668,7 +668,6 @@
<item quantity="one">איש קשר אחד יובא מכרטיס ה-SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"לא ניתן היה להיכנס לחשבון"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"בחר אנשי קשר לייבוא"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"בטל את הייבוא"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"הסינכרון האוטומטי מושבת. הקש כדי להפעיל אותו."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3d72e84..6396b0d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 件の SIM の連絡先をインポートしました</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM の連絡先をインポートできませんでした"</string>
- <string name="connection_failed" msgid="7558253972301525402">"ログインできませんでした"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"インポートする連絡先の選択"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"インポートをキャンセル"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"自動同期が OFF になっています。タップすると ON になります。"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 9d62e51..27f54f5 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">იმპორტირებულია 1 SIM კონტაქტი</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM კონტაქტების იმპორტირება ვერ მოხერხდა"</string>
- <string name="connection_failed" msgid="7558253972301525402">"შესვლა ვერ მოხერხდა"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"აირჩიეთ კონტაქტი იმპორტისათვის"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"იმპორტის გაუქმება"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ავტო-სინქ. გამორთულია. შეეხეთ ჩასართავად."</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index a1c7164..7b599cb 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM контактісі импортталды</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM контактілері импортталмады"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Жүйеге кіру мүмкін болмады"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Импортталатын контактілерді таңдау"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Импорттауды тоқтату"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автоматты синхрондау өшірулі. Қосу үшін түртіңіз."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 24d93c4..bd1297c 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">បាននាំចូលទំនាក់ទំនង SIM 1</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"មិនអាចនាំចូលទំនាក់ទំនងពី SIM បានទេ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"មិនអាចចូលបានទេ"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ជ្រើសទំនាក់ទំនង ដើម្បីនាំចូល"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"បោះបង់ការនាំចូល"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ការធ្វើសមកាលស្វ័យប្រវត្តិត្រូវបានបិទ។ ចុច ដើម្បីបើក។"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f6053a7..59de3af 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಸಿಮ್ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗಿದೆ</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"ಸಿಮ್ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ವಿಫಲವಾಗಿದೆ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"ಸೈನ್ ಇನ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ಆಮದು ಮಾಡಲು ಸಂಪರ್ಕಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ಆಮದು ರದ್ದುಮಾಡಿ"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ. ಆನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8d8d8be..4d09a41 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">SIM 연락처 1개를 가져옴</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM 연락처를 가져오지 못했습니다."</string>
- <string name="connection_failed" msgid="7558253972301525402">"로그인하지 못했습니다."</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"가져올 주소록 선택"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"가져오기 취소"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"자동 동기화가 사용 중지되어 있습니다. 사용 설정하려면 탭하세요."</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 6c4a9cf..706d219 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -746,7 +746,6 @@
<item quantity="one">SIM-картадан 1 байланыш өткөрүлүп алынды</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM-картадагы байланыштар өткөрүлүп алынган жок"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Кире алган жоксуз"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Импорттоло турган байланыштарды тандаңыз"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Импорттоону жокко чыгаруу"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Түзмөктүн авто шайкештештирүү функциясы өчүрүлгөн. Күйгүзүү үчүн тийип коюңуз."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 3f1b111..68a87ae 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">ນຳເຂົ້າ 1 ລາຍຊື່ຜູ້ຕິດຕໍ່ຊິມແລ້ວ</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"ນຳເຂົ້າລາຍຊື່ຜູ້ຕິດຕໍ່ຈາກຊິມກາດບໍ່ສຳເລັດ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"ເຂົ້າສູ່ລະບົບບໍ່ສຳເລັດ"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ເລືອກລາຍຊື່ເພື່ອນຳເຂົ້າ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ຍົກເລີກການນຳເຂົ້າ"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຖືກປິດໄວ້. ແຕະເພື່ອເປີດໃຊ້."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 37ecdb0..926e294 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -668,7 +668,6 @@
<item quantity="other">Importuota <xliff:g id="COUNT">%d</xliff:g> SIM kortelės kontaktų</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Nepavyko importuoti SIM kortelės kontaktų"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Nepavyko prisijungti"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Pasirinkti importuojamus kontaktus"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Atšaukti importavimą"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatinis sinchronizavimas išjungtas. Jei norite įjungti, palieskite."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index daa0a52..68c9d71 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -653,7 +653,6 @@
<item quantity="other">Importētas <xliff:g id="COUNT">%d</xliff:g> SIM kartes kontaktpersonas</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Neizdevās importēt SIM kartes kontaktpersonas."</string>
- <string name="connection_failed" msgid="7558253972301525402">"Neizdevās pierakstīties"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Importējamo kontaktpersonu atlase"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Atcelt importēšanu"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automātiskā sinhronizācija ir izslēgta. Pieskarieties, lai to ieslēgtu."</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index bbf53b0..2eb0857 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other">Увезени се <xliff:g id="COUNT">%d</xliff:g> контакти од SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Не успеа увезувањето контакти од SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Не успеа да се најави"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Изберете контакти за увоз"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Откажете го увозот"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автоматското синхронизирање е исклучено. Допрете за да го вклучите."</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b755b16..29f106f 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">ഒരു സിം കോൺടാക്റ്റ് ഇമ്പോർട്ടുചെയ്തു</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
- <string name="connection_failed" msgid="7558253972301525402">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ഇമ്പോർട്ടുചെയ്യാനുള്ളവ തിരഞ്ഞെടുക്കൂ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ഇറക്കുമതി റദ്ദാക്കുക"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"സ്വയ സമന്വയം ഓഫാണ്. ഓണാക്കാൻ ടാപ്പുചെയ്യുക."</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 0a0e39a..52c9140 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -640,7 +640,6 @@
<item quantity="one">1 SIM-н харилцагчийг импорт хийсэн</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM-н харилцагчдыг импортолж чадсангүй"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Нэвтэрч чадсангүй"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Импорт хийх харилцагчдыг сонгоно уу"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Импорт хийхийг цуцлах"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автомат синк идэвхгүй байна. Идэвхжүүлэх бол товшино уу."</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 67a4a8c..48173b8 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> सिम संपर्क आयात केले</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"सिम संपर्क आयात करण्यात अयशस्वी"</string>
- <string name="connection_failed" msgid="7558253972301525402">"साइन इन करण्यात अयशस्वी झाले"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"आयात करण्यासाठी संपर्क निवडा"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"आयात रद्द करा"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"स्वयं-संकालन बंद आहे. चालू करण्यासाठी टॅप करा."</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d45c474..e269d15 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -640,7 +640,6 @@
<item quantity="one">1 kenalan SIM diimport</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Gagal mengimport kenalan SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Gagal log masuk"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Pilih kenalan untuk diimport"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Batalkan import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Auto segerak dimatikan. Ketik untuk menghidupkannya."</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 6c113c2..00a207e 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">ဆင်းမ်အဆက်အသွယ် ၁ ခုကို တင်သွင်းပြီးပါပြီ</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"ဆင်းမ်အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"အကောင့် ဝင်၍မရပါ"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"တင်သွင်းရန် လိပ်စာများကို ရွေးပါ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"တင်သွင်းမှု ပယ်ဖျက်ရန်"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"အလိုအလျောက်စင့်ခ်လုပ်ခြင်းကို ပိတ်ထားသည်။ ဖွင့်ရန်အတွက် တို့ပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 580fde7..173a056 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Én SIM-kontakt ble importert</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kunne ikke importere SIM-kontakter"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Kunne ikke logge på"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Velg kontaktene du vil importere"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Avbryt import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatisk synkronisering er slått av. Trykk for å slå det på."</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 0424898..84832ab 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">SIM को १ सम्पर्क आयात गरियो</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM को सम्पर्कहरू आयात गर्न सकिएन"</string>
- <string name="connection_failed" msgid="7558253972301525402">"साइन इन गर्न सकिएन"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"आयात गर्न सम्पर्कहरू चयन गर्नुहोस्"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"आयात रद्द गर्नुहोस्"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"स्वत:सिङ्क गर्ने सेवा निष्क्रिय छ। सक्रिय गर्न ट्याप गर्नुहोस्।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1f2ae53..9815c2e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 contact op simkaart geïmporteerd</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kan contacten op simkaart niet importeren"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Inloggen is mislukt"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Contacten selecteren om te importeren"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Importeren annuleren"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatisch synchroniseren is uitgeschakeld. Tik om in te schakelen."</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 2c47ad3..9f894ea 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> SIM ਸੰਪਰਕ ਆਯਾਤ ਕੀਤੇ ਗਏ</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM ਸੰਪਰਕਾਂ ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"ਸਾਈਨ ਇਨ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ਆਯਾਤ ਕਰਨ ਲਈ ਸੰਪਰਕ ਚੁਣੋ"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ਆਯਾਤ ਰੱਦ ਕਰੋ"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ਸਵੈ-ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਹੈ। ਚਾਲੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ad6dc03..52d03cc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -668,7 +668,6 @@
<item quantity="one">Zaimportowano 1 kontakt z karty SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Nie udało się zaimportować kontaktów z karty SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Nie udało się zalogować"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Wybierz kontakty do importowania"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Anuluj importowanie"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatyczna synchronizacja jest wyłączona. Kliknij, by ją włączyć."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index f7fe599..b380587 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contatos importados do SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Falha ao importar contatos do SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Falha ao fazer login"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Selecione os contatos a serem importados"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importação"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"A sincronização automática está desativada. Toque para ativar."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8fa5f4d..cd577e4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 contacto do cartão SIM importado</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Ocorreu uma falha ao iniciar sessão"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Selecione os contactos a importar"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importação"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"A sincronização automática está desativada. Toque para ativar."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f7fe599..b380587 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contatos importados do SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Falha ao importar contatos do SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Falha ao fazer login"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Selecione os contatos a serem importados"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Cancelar importação"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"A sincronização automática está desativada. Toque para ativar."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f0e5247..f2a7c3f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -653,7 +653,6 @@
<item quantity="one">A fost importată o persoană de contact de pe SIM.</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Nu s-au importat persoanele de contact de pe SIM."</string>
- <string name="connection_failed" msgid="7558253972301525402">"Nu v-ați conectat."</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Selectați persoane de contact pentru import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Anulați importul"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Sincronizarea automată este dezactivată. Atingeți pentru a o activa."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5354a1a..b3d4d35 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -668,7 +668,6 @@
<item quantity="other">Импортировано <xliff:g id="COUNT">%d</xliff:g> контакта с SIM-карты</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Не удалось импортировать контакты с SIM-карты"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Не удалось войти в систему"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Выберите контакты для импорта"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Отменить импорт"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автосинхронизация отключена. Нажмите, чтобы ее включить."</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8f4c639..d306055 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other">SIM සම්බන්ධතා <xliff:g id="COUNT">%d</xliff:g>ක් ආයාත කරන ලදී</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM සම්බන්ධතා ආයාත කිරීමට අසමත් විය"</string>
- <string name="connection_failed" msgid="7558253972301525402">"පිරීමට අසමත් විය"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"ආයාත කිරීමට සම්බන්ධතා තෝරන්න"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ආයාත කිරීම අවලංගු කරන්න"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ස්වයංක්රිය සමමුහුර්ත කිරීම ක්රියාවිරහිතයි. ක්රියාත්මක කිරීමට තට්ටු කරන්න."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 10b116e..822f800 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -668,7 +668,6 @@
<item quantity="one">Importoval sa 1 kontakt na SIM karte</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Import kontaktov na SIM karte zlyhal"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Prihlásenie zlyhalo"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Výber kontaktov na import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Zrušiť import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatická synchronizácia je vypnutá. Zapnete ju klepnutím."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6dda9be..f3ae1ad 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -668,7 +668,6 @@
<item quantity="other">S kartice SIM je uvoženih <xliff:g id="COUNT">%d</xliff:g> stikov</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Stikov s kartice SIM ni bilo mogoče uvoziti"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Prijava ni uspela"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Izberite stike za uvoz"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Prekliči uvoz"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Samodejna sinhronizacija je izklopljena. Dotaknite se, da jo vklopite."</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index aa0e4a4..a3210be 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 kontakt i kartës SIM u importua</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Importimi i kontakteve të kartës SIM dështoi"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Identifikimi dështoi"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Zgjidh kontaktet për importim"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Anulo importimin"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Sinkronizimi automatik është joaktiv. Trokit për ta aktivizuar."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 739a558..960817d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -653,7 +653,6 @@
<item quantity="other">Увезено је <xliff:g id="COUNT">%d</xliff:g> контаката са SIM картице</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Увоз контаката са SIM картице није успео"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Пријављивање није успело"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Изаберите контакте за увоз"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Откажите увоз"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Аутоматска синхронизација је искључена. Додирните да бисте је укључили."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6c98912..c7c28b0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">En SIM-kontakt importerad</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Det gick inte att importera SIM-kontakter"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Det gick inte att logga in"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Välj kontakter att importera"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Avbryt import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Automatisk synkronisering har inaktiverats. Aktivera genom att trycka."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index dffa0ec..94c66e4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -640,7 +640,6 @@
<item quantity="one">Anwani 1 iliyokuwa kwenye SIM imeletwa</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Imeshindwa kuleta anwani zilizo kwenye SIM kadi"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Imeshindwa kuingia katika akaunti"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Chagua anwani za kuleta"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Ghairi uletaji"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gonga ili uuwashe."</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 40a7df0..8a74523 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 சிம் தொடர்பு இறக்கப்பட்டது</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"சிம் தொடர்புகளை இறக்க முடியவில்லை"</string>
- <string name="connection_failed" msgid="7558253972301525402">"உள்நுழைய முடியவில்லை"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"இறக்க வேண்டிய தொடர்புகளைத் தேர்ந்தெடுக்கவும்"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"இறக்குவதை ரத்துசெய்வதற்கான ஐகான்"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"தானாக ஒத்திசை எனும் அம்சம் முடக்கப்பட்டுள்ளது. இயக்க, தட்டவும்."</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 943913c..6643d79 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM పరిచయం దిగుమతి చేయబడింది</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM పరిచయాలను దిగుమతి చేయడంలో విఫలమైంది"</string>
- <string name="connection_failed" msgid="7558253972301525402">"సైన్ ఇన్ చేయడంలో విఫలమైంది"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"దిగుమతి చేయాల్సిన పరిచయాలను ఎంచుకోండి"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"దిగుమతిని రద్దు చేస్తుంది"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"స్వీయ-సమకాలీకరణ ఆఫ్లో ఉంది. ఆన్ చేయడానికి నొక్కండి."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ad1f7a8..e45ed87 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">นำเข้าผู้ติดต่อ 1 รายจากซิมแล้ว</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"นำเข้าผู้ติดต่อจากซิมไม่สำเร็จ"</string>
- <string name="connection_failed" msgid="7558253972301525402">"ไม่สามารถลงชื่อเข้าใช้ได้"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"เลือกผู้ติดต่อที่จะนำเข้า"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"ยกเลิกการนำเข้า"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"ซิงค์อัตโนมัติปิดอยู่ แตะเพื่อเปิด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7573480..895bbed 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> na contact sa SIM ang na-import</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Hindi na-import ang mga contact sa SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Hindi nakapag-sign in"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Piliin ang mga contact na ii-import"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Kanselahin ang pag-import"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Naka-off ang auto-sync. I-tap upang i-on."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 683c884..1b4b7f7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM kişisi içe aktarıldı</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM kişileri içe aktarılamadı"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Oturum açılamadı"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"İçe aktarılacak kişileri seçin"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"İçe aktarma iptal edilir"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Otomatik senkronizasyon kapalı. Açmak için dokunun."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b1373c4..ee64675 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -668,7 +668,6 @@
<item quantity="other">Імпортовано <xliff:g id="COUNT">%d</xliff:g> контакта із SIM-карти</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Не вдалось імпортувати контакти із SIM-карти"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Помилка входу"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Виберіть контакти для імпорту"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Скасувати імпорт"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Автоматичну синхронізацію вимкнено. Торкніться, щоб увімкнути."</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index b639e66..7e7f3df 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 SIM رابطہ درآمد ہو گیا</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"SIM رابطے درآمد کرنے میں ناکام"</string>
- <string name="connection_failed" msgid="7558253972301525402">"سائن ان کرنے میں ناکام"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"درآمد کیلئے رابطے چنیں"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"برآمد منسوخ کریں"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"خودکار مطابقت پذیری آف ہے۔ آن کرنے کیلئے تھپتھپائیں۔"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 574d316..f3daaa5 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">1 ta kontakt SIM kartadan import qilindi</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Kontaktlarni SIM kartadan import qilib bo‘lmadi"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Tizimga kirib bo‘lmadi"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Import qilish uchun kontaktlarni tanlang"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Import qilishni bekor qilish"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Avto-sinxronlash o‘chiq. Uni yoqish uchun bosing."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 751eb93..f8c1399 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">Đã nhập 1 liên hệ trên SIM</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Không nhập được liên hệ trên SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Không đăng nhập được"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Chọn danh bạ để nhập"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Hủy nhập"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Tự động đồng bộ hóa đang tắt. Hãy nhấn để bật."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 54fd02f..afb538b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">已导入 1 位 SIM 卡联系人</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"无法导入 SIM 卡联系人"</string>
- <string name="connection_failed" msgid="7558253972301525402">"无法登录"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"选择要导入的联系人"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"取消导入"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"自动同步功能已关闭。点按即可开启。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9ede029..b82e2d8 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">已匯入 1 位 SIM 聯絡人</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"無法匯入 SIM 聯絡人"</string>
- <string name="connection_failed" msgid="7558253972301525402">"無法登入"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"選取要匯入的聯絡人"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"取消匯入"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"自動同步已關閉。輕按以開啟。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2af4465..0d83b0f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -638,7 +638,6 @@
<item quantity="one">已匯入 1 位 SIM 卡聯絡人</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"無法匯入 SIM 卡聯絡人"</string>
- <string name="connection_failed" msgid="7558253972301525402">"無法登入"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"選取要匯入的聯絡人"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"取消匯入"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"自動同步功能已關閉。輕觸即可開啟。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 803fa66..802d062 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -638,7 +638,6 @@
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> oxhumana nabo be-SIM bangenisiwe</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Yehlulekile ukungenisa oxhumana nabo be-SIM"</string>
- <string name="connection_failed" msgid="7558253972301525402">"Yehlulekile ukungena ngemvume"</string>
<string name="sim_import_dialog_title" msgid="6699935401502172530">"Khetha othintana nabo ozobangenisa"</string>
<string name="sim_import_cancel_content_description" msgid="2388362519166414488">"Khansela ukungenisa"</string>
<string name="auto_sync_off" msgid="2180147284456026587">"Ukuvumelanisa okuzenzekelelayo kuvaliwe.Thepha ukuze uvule."</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16af0de..9a1dd19 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1875,8 +1875,6 @@
<!-- 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 1b4fc62..af11c90 100644
--- a/src-bind/com/android/contactsbind/ObjectFactory.java
+++ b/src-bind/com/android/contactsbind/ObjectFactory.java
@@ -13,9 +13,7 @@
*/
package com.android.contactsbind;
-import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.util.NavigationDrawer;
import com.android.contactsbind.search.AutocompleteHelper;
import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
@@ -48,8 +46,4 @@
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 b7ae71a..957181b 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -26,7 +26,6 @@
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.view.MenuItemCompat;
@@ -34,7 +33,6 @@
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.Gravity;
import android.view.LayoutInflater;
@@ -63,7 +61,6 @@
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;
@@ -83,7 +80,6 @@
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;
@@ -149,7 +145,7 @@
private void stopSearchAndSelection() {
final MultiSelectContactsListFragment listFragment;
- if (isAccountView()) {
+ if (isAllContactsView() || isAccountView()) {
listFragment = getAllFragment();
} else if (isGroupView()) {
listFragment = getGroupFragment();
@@ -196,7 +192,7 @@
}
protected ContactListFilterController mContactListFilterController;
- protected DrawerLayout mDrawerLayout;
+ protected DrawerLayout mDrawer;
protected ContactsActionBarDrawerToggle mToggle;
protected Toolbar mToolbar;
protected NavigationView mNavigationView;
@@ -206,8 +202,6 @@
// The account the new group will be created under.
private AccountWithDataSet mNewGroupAccount;
- private NavigationDrawer mNavigationDrawer;
-
// Recycle badge if possible
private TextView mAssistantNewBadge;
@@ -218,18 +212,10 @@
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().getBoolean(Experiments.ACCOUNT_SWITCHER);
-
mContactListFilterController = ContactListFilterController.getInstance(this);
mContactListFilterController.checkFilterValidity(false);
@@ -243,12 +229,11 @@
ViewUtil.addRectangularOutlineProvider(findViewById(R.id.toolbar_parent), getResources());
// Set up hamburger button.
- mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
- mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar,
+ mDrawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+ mToggle = new ContactsActionBarDrawerToggle(this, mDrawer, 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
@@ -261,27 +246,21 @@
if (savedState != null) {
mCurrentView = ContactsView.values()[savedState.getInt(KEY_CONTACTS_VIEW)];
} else {
- resetContactsView();
+ mCurrentView = ContactsView.ALL_CONTACTS;
}
+ // Set up hamburger menu items.
+ mNavigationView = (NavigationView) findViewById(R.id.nav_view);
+ mNavigationView.setNavigationItemSelectedListener(this);
+ setUpMenu();
+
+ initializeAssistantNewBadge();
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();
- initializeAssistantNewBadge();
- }
-
- protected void resetContactsView() {
- mCurrentView = mShouldShowAccountSwitcher
- ? ContactsView.ACCOUNT_VIEW : ContactsView.ALL_CONTACTS;
}
private void initializeAssistantNewBadge() {
@@ -305,7 +284,7 @@
public void setDrawerLockMode(boolean enabled) {
// Prevent drawer from being opened by sliding from the start of screen.
- mDrawerLayout.setDrawerLockMode(enabled ? DrawerLayout.LOCK_MODE_UNLOCKED
+ mDrawer.setDrawerLockMode(enabled ? DrawerLayout.LOCK_MODE_UNLOCKED
: DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
// Order of these statements matter.
@@ -337,14 +316,10 @@
menu.removeItem(R.id.nav_help);
}
- 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);
+ final MenuItem allContactsMenu = menu.findItem(R.id.nav_all_contacts);
+ mIdMenuMap.put(R.id.nav_all_contacts, allContactsMenu);
+ if (isAllContactsView()) {
+ updateMenuSelection(allContactsMenu);
}
}
@@ -364,11 +339,9 @@
@Override
protected void onResume() {
super.onResume();
- if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
+ if (mDrawer.isDrawerOpen(GravityCompat.START)) {
updateStatusBarBackground();
}
- // Restoring recent accounts.
- mNavigationDrawer.onResume();
}
public void updateStatusBarBackground() {
@@ -378,12 +351,11 @@
public void updateStatusBarBackground(int color) {
if (!CompatUtils.isLollipopCompatible()) return;
if (color == -1) {
- mDrawerLayout.setStatusBarBackgroundColor(
- MaterialColorMapUtils.getStatusBarColor(this));
+ mDrawer.setStatusBarBackgroundColor(MaterialColorMapUtils.getStatusBarColor(this));
} else {
- mDrawerLayout.setStatusBarBackgroundColor(color);
+ mDrawer.setStatusBarBackgroundColor(color);
}
- mDrawerLayout.invalidate();
+ mDrawer.invalidate();
getWindow().setStatusBarColor(Color.TRANSPARENT);
}
@@ -399,24 +371,6 @@
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();
@@ -457,39 +411,15 @@
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 (mGroupListItems != null ) {
+ if (groupListItems != null) {
// Add each group
- for (final GroupListItem groupListItem : getGroupsForCurrentAccount(mCurrentAccount)) {
+ for (final GroupListItem groupListItem : groupListItems) {
if (GroupUtil.isEmptyFFCGroup(groupListItem)) {
continue;
}
@@ -513,7 +443,7 @@
updateMenuSelection(menuItem);
}
});
- mDrawerLayout.closeDrawer(GravityCompat.START);
+ mDrawer.closeDrawer(GravityCompat.START);
return true;
}
});
@@ -538,33 +468,17 @@
onCreateGroupMenuItemClicked();
}
});
- mDrawerLayout.closeDrawer(GravityCompat.START);
+ mDrawer.closeDrawer(GravityCompat.START);
return true;
}
});
if (isGroupView() && groupMetaData != null) {
- updateGroupMenuCheckedStatus(groupMetaData);
+ updateGroupMenu(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) {
+ public void updateGroupMenu(GroupMetaData groupMetaData) {
clearCheckedMenus();
if (groupMetaData != null && mGroupMenuMap != null
&& mGroupMenuMap.get(groupMetaData.groupId) != null) {
@@ -604,12 +518,7 @@
final Account account = extras == null ? null :
(Account) extras.getParcelable(Intents.Insert.EXTRA_ACCOUNT);
if (account == null) {
- if (mShouldShowAccountSwitcher && mCurrentAccount != null) {
- // Create a new group in current account.
- onAccountChosen(mCurrentAccount, /* extraArgs */ null);
- } else {
- selectAccountForNewGroup();
- }
+ selectAccountForNewGroup();
} else {
final String dataSet = extras == null
? null : extras.getString(Intents.Insert.EXTRA_DATA_SET);
@@ -621,11 +530,6 @@
@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);
@@ -639,6 +543,7 @@
return;
}
+
for (int i = 0; i < accountFilterItems.size(); i++) {
final ContactListFilter filter = accountFilterItems.get(i);
final AccountDisplayInfo displayableAccount =
@@ -662,7 +567,7 @@
updateMenuSelection(menuItem);
}
});
- mDrawerLayout.closeDrawer(GravityCompat.START);
+ mDrawer.closeDrawer(GravityCompat.START);
return true;
}
});
@@ -704,21 +609,8 @@
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(@NonNull final MenuItem item) {
+ public boolean onNavigationItemSelected(final MenuItem item) {
final int id = item.getItemId();
mToggle.runWhenIdle(new Runnable() {
@Override
@@ -743,14 +635,10 @@
}
});
- mDrawerLayout.closeDrawer(GravityCompat.START);
+ mDrawer.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,
@@ -759,15 +647,12 @@
}
public void switchToAllContacts() {
- if (mShouldShowAccountSwitcher) {
- clearCheckedMenus();
- } else {
- resetFilter();
+ 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));
}
@@ -802,9 +687,6 @@
}
private void setMenuChecked(MenuItem menuItem, boolean checked) {
- if (menuItem == null) {
- return;
- }
menuItem.setCheckable(checked);
menuItem.setChecked(checked);
}
@@ -830,7 +712,6 @@
@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 0bf7908..5d478fe 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -268,8 +268,8 @@
if (isGroupDeleteAction(action)) {
popSecondLevel();
- resetContactsView();
mMembersFragment.toastForSaveAction(action);
+ mCurrentView = ContactsView.ALL_CONTACTS;
showFabWithAnimation(/* showFab */ true);
return;
}
@@ -519,9 +519,6 @@
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
@@ -625,8 +622,8 @@
}
// Handle the back event in drawer first.
- if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
- mDrawerLayout.closeDrawer(GravityCompat.START);
+ if (mDrawer.isDrawerOpen(GravityCompat.START)) {
+ mDrawer.closeDrawer(GravityCompat.START);
return;
}
@@ -693,8 +690,7 @@
return true;
}
- if (!mShouldShowAccountSwitcher
- && !AccountFilterUtil.isAllContactsFilter(mContactListFilterController.getFilter())
+ if (!AccountFilterUtil.isAllContactsFilter(mContactListFilterController.getFilter())
&& !mAllFragment.isHidden()) {
// If mAllFragment is hidden, then mContactsUnavailableFragment is visible so we
// don't need to switch to all contacts.
@@ -789,17 +785,6 @@
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()) {
@@ -848,7 +833,7 @@
popSecondLevel();
}
mShouldSwitchToAllContacts = false;
- resetContactsView();
+ mCurrentView = ContactsView.ALL_CONTACTS;
showFabWithAnimation(/* showFab */ true);
mAllFragment.scrollToTop();
diff --git a/src/com/android/contacts/common/Experiments.java b/src/com/android/contacts/common/Experiments.java
index 1a7fe2e..b182491 100644
--- a/src/com/android/contacts/common/Experiments.java
+++ b/src/com/android/contacts/common/Experiments.java
@@ -21,11 +21,6 @@
public final class Experiments {
/**
- * Experiment to enable account switcher
- */
- public static final String ACCOUNT_SWITCHER = "Account__account_switcher_enable";
-
- /**
* Whether to open contact sheet (aka smart profile) instead of our own QuickContact.
*/
public static final String CONTACT_SHEET = "QuickContact__contact_sheet";
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/common/list/ContactListFilter.java
index f3bac38..5b7472d 100644
--- a/src/com/android/contacts/common/list/ContactListFilter.java
+++ b/src/com/android/contacts/common/list/ContactListFilter.java
@@ -394,7 +394,7 @@
/**
* Returns true if this ContactListFilter contains at least one Google account.
- * (see {@link #isGoogleAccountType )
+ * (see {@link #isGoogleAccountType)
*/
public boolean isSyncable(List<AccountWithDataSet> accounts) {
if (isGoogleAccountType() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
@@ -410,7 +410,8 @@
// If we're showing all contacts and there is any Google account on the device then
// we're syncable.
for (AccountWithDataSet account : accounts) {
- if (account.isWritableGoogleAccount()) {
+ if (GoogleAccountType.ACCOUNT_TYPE.equals(account.type)
+ && account.dataSet == null) {
return true;
}
}
@@ -420,7 +421,7 @@
}
/**
- * Returns the Google accounts (see {@link #isGoogleAccountType ) for this ContactListFilter.
+ * Returns the Google accounts (see {@link #isGoogleAccountType) for this ContactListFilter.
*/
public List<Account> getSyncableAccounts(List<AccountWithDataSet> accounts) {
final List<Account> syncableAccounts = new ArrayList<>();
@@ -432,7 +433,8 @@
|| filterType == ContactListFilter.FILTER_TYPE_DEFAULT) {
if (accounts != null && accounts.size() > 0) {
for (AccountWithDataSet account : accounts) {
- if (account.isWritableGoogleAccount()) {
+ if (GoogleAccountType.ACCOUNT_TYPE.equals(account.type)
+ && account.dataSet == null) {
syncableAccounts.add(new Account(account.name, account.type));
}
}
diff --git a/src/com/android/contacts/common/list/ContactListFilterController.java b/src/com/android/contacts/common/list/ContactListFilterController.java
index 5ceef18..4d3d6ad 100644
--- a/src/com/android/contacts/common/list/ContactListFilterController.java
+++ b/src/com/android/contacts/common/list/ContactListFilterController.java
@@ -81,8 +81,6 @@
* which case, we should switch to the last saved filter in {@link SharedPreferences}.
*/
public abstract void checkFilterValidity(boolean notifyListeners);
-
- public abstract Context getContext();
}
/**
@@ -198,9 +196,4 @@
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 8d01892..15c9771 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/common/model/AccountTypeManager.java
@@ -313,13 +313,13 @@
return -1;
} else if (a.name == null || a.type == null) {
return 1;
- } else if (a.isWritableGoogleAccount() && a.equals(mDefaultAccount)) {
+ } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
return -1;
- } else if (b.isWritableGoogleAccount() && b.equals(mDefaultAccount)) {
+ } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
return 1;
- } else if (a.isWritableGoogleAccount() && !b.isWritableGoogleAccount()) {
+ } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
return -1;
- } else if (b.isWritableGoogleAccount() && !a.isWritableGoogleAccount()) {
+ } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
return 1;
} else {
int diff = a.name.compareToIgnoreCase(b.name);
@@ -339,6 +339,10 @@
}
}
}
+
+ 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 c5463d6..f68fdd5 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 mSource.isWritableGoogleAccount();
+ return GoogleAccountType.ACCOUNT_TYPE.equals(mSource.type) && mSource.dataSet == null;
}
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 4917abc..3ee0aab 100644
--- a/src/com/android/contacts/common/model/account/AccountWithDataSet.java
+++ b/src/com/android/contacts/common/model/account/AccountWithDataSet.java
@@ -79,10 +79,6 @@
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 5a79877..ac7b0e0 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/common/preference/ContactsPreferences.java
@@ -20,7 +20,6 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.preference.PreferenceManager;
@@ -68,10 +67,6 @@
public static final boolean PREF_DISPLAY_ONLY_PHONES_DEFAULT = false;
- 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
*/
@@ -238,26 +233,6 @@
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 void registerChangeListener(ChangeListener listener) {
if (mListener != null) unregisterChangeListener();
diff --git a/src/com/android/contacts/common/util/AccountFilterUtil.java b/src/com/android/contacts/common/util/AccountFilterUtil.java
index ed72f67..96c5113 100644
--- a/src/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/src/com/android/contacts/common/util/AccountFilterUtil.java
@@ -32,7 +32,6 @@
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;
@@ -43,7 +42,6 @@
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;
@@ -91,7 +89,8 @@
if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {
filterController.selectCustomFilter();
} else {
- filterController.setContactListFilter(filter, shouldPersistFilter(filter));
+ filterController.setContactListFilter(filter, /* persistent */
+ filter.filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS);
}
}
}
@@ -133,7 +132,6 @@
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);
@@ -238,11 +236,4 @@
return account.withFormattedName(context, R.string.title_from_other_accounts)
.getNameLabel().toString();
}
-
- public static boolean shouldPersistFilter(ContactListFilter filter) {
- if (Flags.getInstance().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 e54b31f..040a6b4 100644
--- a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
+++ b/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
@@ -52,6 +52,7 @@
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
deleted file mode 100644
index c60f029..0000000
--- a/src/com/android/contacts/common/util/NavigationDrawer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 bd333fc..44bda74 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -731,7 +731,7 @@
maybeAttachCheckBoxListener();
mActivity.setTitle(mGroupMetaData.groupName);
- mActivity.updateGroupMenuCheckedStatus(mGroupMetaData);
+ mActivity.updateGroupMenu(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 a4bfdd1..f7ae30d 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -29,7 +29,6 @@
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -73,13 +72,8 @@
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;
@@ -89,7 +83,6 @@
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;
@@ -163,7 +156,6 @@
private ContactsDrawerActivity mActivity;
private ContactsRequest mContactsRequest;
private ContactListFilterController mContactListFilterController;
- private DeviceLocalAccountTypeFactory mDeviceLocalFactory;
private final ActionBarAdapter.Listener mActionBarListener = new ActionBarAdapter.Listener() {
@Override
@@ -457,14 +449,13 @@
mIsRecreatedInstance = (savedState != null);
mContactListFilterController = ContactListFilterController.getInstance(getContext());
mContactListFilterController.checkFilterValidity(false);
- mDeviceLocalFactory = ObjectFactory.getDeviceLocalAccountTypeFactory(getContext());
- if (!Flags.getInstance().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()));
- }
+ // 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);
}
@Override
@@ -960,7 +951,7 @@
*/
private void setContactListFilter(ContactListFilter filter) {
mContactListFilterController.setContactListFilter(filter,
- AccountFilterUtil.shouldPersistFilter(filter));
+ /* persistent */ isAllContactsFilter(filter));
}
@Override