am 090e6396: (-s ours) Import translations. DO NOT MERGE
* commit '090e63964316e93fb185eae398d126d8be3e7881':
Import translations. DO NOT MERGE
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
new file mode 100644
index 0000000..1999fce
--- /dev/null
+++ b/res/layout/select_account_list_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
+<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="4dp" >
+
+ <ImageView android:id="@+id/icon"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:tint="@color/dialtacts_secondary_text_color"
+ android:scaleType="center" />
+
+ <TextView android:id="@+id/text"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="start|center_vertical"
+ android:layout_marginLeft="8dp"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="match_parent" />
+</view>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c30de7d..dd5c233 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"hou op soek"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Vee soektog uit"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opsies vir wys van kontakte"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Kies rekening"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ed268bb..9fc2d26 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"መፈለግ አቁም"</string>
<string name="description_clear_search" msgid="3893511425518852086">"ፍለጋን አጽዳ"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"የእውቂያ ማሳያ አማራጮች"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"መለያ ይምረጡ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b28642b..1153caf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"إيقاف البحث"</string>
<string name="description_clear_search" msgid="3893511425518852086">"محو البحث"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"خيارات عرض جهات الاتصال"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"تحديد الحساب"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9a7f10f..89a46dd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"спиране на търсенето"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Изчистване на търсенето"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Опции за показване на контактите"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Избиране на профил"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 6f8e89a..4752ac8 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -91,7 +91,7 @@
<string name="nameLabelsGroup" msgid="1817502703362057154">"নাম"</string>
<string name="nicknameLabelsGroup" msgid="6312795212164843246">"ডাকনাম"</string>
<string name="full_name" msgid="885420216812981202">"নাম"</string>
- <string name="name_given" msgid="4153709115654909377">"প্রথম নাম"</string>
+ <string name="name_given" msgid="4153709115654909377">"আদ্য নাম"</string>
<string name="name_family" msgid="5317387657540738981">"পারিবারিক নাম"</string>
<string name="name_prefix" msgid="8219879405071462309">"নামের আগের অংশ"</string>
<string name="name_middle" msgid="3951610314424632183">"মাঝের নাম"</string>
@@ -160,8 +160,8 @@
<string name="listCustomView" msgid="1915154113477432033">"কাস্টম দৃশ্যে পরিচিতিগুলি"</string>
<string name="listSingleContact" msgid="8525131203887307088">"একক পরিচিতি"</string>
<string name="dialog_new_contact_account" msgid="4107520273478326011">"অ্যাকাউন্টের অধীনে পরিচিতি তৈরি করুন"</string>
- <string name="import_from_sim" msgid="4749894687871835873">"সিম কার্ড থেকে আমদানি করুন"</string>
- <string name="import_from_sim_number" msgid="1232500923375370101">"সিম কার্ড #<xliff:g id="SIM_NUMBER">%d</xliff:g> থেকে আমদানি করুন"</string>
+ <string name="import_from_sim" msgid="4749894687871835873">"SIM কার্ড থেকে আমদানি করুন"</string>
+ <string name="import_from_sim_number" msgid="1232500923375370101">"SIM কার্ড #<xliff:g id="SIM_NUMBER">%d</xliff:g> থেকে আমদানি করুন"</string>
<string name="import_from_sdcard" product="default" msgid="6423964533801496764">"সংগ্রহস্থল থেকে আমদানি করুন"</string>
<string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> এর আমদানি বাতিল করবেন?"</string>
<string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> এর রপ্তানি বাতিল করবেন?"</string>
@@ -223,7 +223,7 @@
<string name="progress_notifier_message" msgid="359931715339778107">"আমদানি করা হচ্ছে, <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="export_to_sdcard" product="default" msgid="3665618085563543169">"সংগ্রহস্থলে রপ্তানি করুন"</string>
<string name="display_options_sort_list_by" msgid="8635268562263708102">"এর দ্বারা সাজান"</string>
- <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"প্রথম নাম"</string>
+ <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"আদ্য নাম"</string>
<string name="display_options_sort_by_family_name" msgid="8196947856299225342">"পারিবারিক নাম"</string>
<string name="display_options_view_names_as" msgid="3232196224409242435">"নামের বিন্যাস"</string>
<string name="display_options_view_given_name_first" msgid="7283772578267332801">"প্রথমে আদ্য নাম"</string>
@@ -243,7 +243,7 @@
<string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"কোনো পছন্দসই নেই৷"</string>
<string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> এ কোনো পরিচিতি নেই"</string>
<string name="menu_clear_frequents" msgid="8492322695770647639">"পুনরাবৃত্তি সাফ করুন"</string>
- <string name="menu_select_sim" msgid="7814841439832447299">"সিম কার্ড নির্বাচন করুন"</string>
+ <string name="menu_select_sim" msgid="7814841439832447299">"SIM কার্ড নির্বাচন করুন"</string>
<string name="menu_accounts" msgid="795417468541517082">"অ্যাকাউন্টগুলি"</string>
<string name="menu_import_export" msgid="6446229463809981669">"আমদানি/রপ্তানি"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> এর মাধ্যমে"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6b64803..8e41d21 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"Atura la cerca."</string>
<string name="description_clear_search" msgid="3893511425518852086">"Esborra la cerca."</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcions de visualització de contactes"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Selecció d\'un compte"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fde414d..0ef4ec7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"zastavit vyhledávání"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Vymazat vyhledávání"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti zobrazení kontaktů"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Výběr účtu"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e5cd17d..37bab9d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"stop søgning"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Ryd søgning"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Indstillinger for visning af kontaktpersoner"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Vælg konto"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 00091cc..c989285 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"Suche beenden"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Suche zurücksetzen"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Anzeigeoptionen für Kontakte"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Konto auswählen"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f554ea0..e629f99 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"τέλος αναζήτησης"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Εκκαθάριση αναζητήσεων"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Επιλογές εμφάνισης επαφών"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Επιλογή λογαριασμού"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3a0a062..9779a22 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Contact display options"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Select Account"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3a0a062..9779a22 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Contact display options"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Select Account"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f6e321f..37736a0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"detener la búsqueda"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Eliminar búsqueda"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opciones de visualización de contactos"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Seleccionar cuenta"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bdd146c..ee8d7b9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"dejar de buscar"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Borrar la búsqueda"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opciones para mostrar contactos"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Seleccionar cuenta"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 84b585a..e16759c 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"otsimise peatamine"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Otsingu kustutamine"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktide kuvavalikud"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Konto valimine"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 187ba0f..272c926 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"توقف جستجو"</string>
<string name="description_clear_search" msgid="3893511425518852086">"پاک کردن جستجو"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"گزینههای نمایش تماس"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"انتخاب حساب"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ca124ac..6d31b12 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"lopeta hakeminen"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Tyhjennä haku"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Yhteystietojen näyttöasetukset"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Valitse tili"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6b26abe..58a4a1c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Effacer les termes de recherche"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Options d\'affichage des contacts"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Sélectionnez un compte"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index be7c809..a841b20 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Effacer la recherche"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Options d\'affichage des contacts"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Sélectionner un compte"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ff105af..612d7b1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -62,7 +62,7 @@
<string name="sms_mms" msgid="4887206338311086612">"MMS पर लेख संदेश भेजें"</string>
<string name="description_video_call" msgid="4907306403398614909">"वीडियो कॉल करें"</string>
<string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"अक्सर किए जाने वाले संपर्क साफ करें?"</string>
- <string name="clearFrequentsConfirmation" msgid="2101370440975269958">"आपको अक्सर संपर्क करने की सूची लोग ऐप और फ़ोन में से साफ़ करनी होगी, और अपने ईमेल ऐप को आपकी संबोधन करने की शब्दों को शुरु से शिखाना होगा."</string>
+ <string name="clearFrequentsConfirmation" msgid="2101370440975269958">"आपको लोग और फ़ोन ऐप्स में अक्सर संपर्क करने की सूची साफ़ करनी होगी, और अपने ईमेल ऐप्स को आपकी संबोधन करने की शब्दों को शुरु से जानने के लिए बाध्य करना होगा."</string>
<string name="clearFrequentsProgress_title" msgid="3738406170865048982">"अक्सर किए जाने वाले संपर्क साफ कर रहा है…"</string>
<string name="status_available" msgid="4832569677396634846">"उपलब्ध"</string>
<string name="status_away" msgid="6267905184545881094">"दूर"</string>
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"खोजना बंद करें"</string>
<string name="description_clear_search" msgid="3893511425518852086">"खोज साफ़ करें"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"संपर्क प्रदर्शन विकल्प"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"खाता चुनें"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1f13bd8..4238358 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"zaustavi pretraživanje"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Brisanje pretraživanja"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcije prikaza kontakata"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Odabir računa"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a404cff..8797e9f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"keresés leállítása"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Keresés törlése"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Névjegy megjelenítési lehetőségei"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Fiók kiválasztása"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index c14e29c..72f811e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"դադարեցնել որոնումը"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Մաքրել որոնման դաշտը"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Կոնտակտի ցուցադրման ընտրանքները"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Ընտրեք հաշիվ"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c448569..f8307c5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"menghentikan penelusuran"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Hapus penelusuran"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opsi tampilan kontak"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Pilih Akun"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b7847d5..d3db365 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"interrompi ricerca"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Cancella ricerca"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opzioni di visualizzazione dei contatti"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Seleziona account"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index dc7dc9a..144173e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"הפסק לחפש"</string>
<string name="description_clear_search" msgid="3893511425518852086">"נקה את החיפוש"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"אפשרויות להצגת אנשי קשר"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"בחר חשבון"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 51163ee..5e2a5e8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"検索を停止"</string>
<string name="description_clear_search" msgid="3893511425518852086">"検索をクリア"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"連絡先表示オプション"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"アカウントの選択"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 7280ecf..b04586e 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ძიების შეჩერება"</string>
<string name="description_clear_search" msgid="3893511425518852086">"ძიების გასუფთავება"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"კონტაქტის ჩვენების ვარიანტები"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"ანგარიშის არჩევა"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 0b9cdf6..b71e15b 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -140,8 +140,8 @@
<string name="chat_gtalk" msgid="6043734883347741789">"ជជែកដោយប្រើ Google Talk"</string>
<string name="chat_icq" msgid="7538190395602030726">"ជជែកដោយប្រើ ICQ"</string>
<string name="chat_jabber" msgid="4525546665986350869">"ជជែកដោយប្រើ Jabber"</string>
- <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
- <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
+ <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
+ <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
<string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"ពង្រីក ឬបង្រួមវាលឈ្មោះ"</string>
<string name="list_filter_all_accounts" msgid="4265359896628915784">"ទំនាក់ទំនងទាំងអស់"</string>
<string name="list_filter_all_starred" msgid="9060325494254507806">"បានដាក់ផ្កាយ"</string>
@@ -155,7 +155,7 @@
<string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"ការលុប \"<xliff:g id="GROUP">%s</xliff:g>\" ចេញពីសមកាលកម្មវាក៏នឹងលុបទំនាក់ទំនងដែលមិននៅក្នុងក្រុមចេញពីសមកាលកម្មផងដែរ។"</string>
<string name="savingDisplayGroups" msgid="6863012138107446030">"កំពុងរក្សាទុកជម្រើសបង្ហាញ..."</string>
<string name="menu_done" msgid="32470053723443112">"រួចរាល់"</string>
- <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
+ <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
<string name="listAllContactsInAccount" msgid="755499980092808715">"ទំនាក់ទំនងនៅក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listCustomView" msgid="1915154113477432033">"ទំនាក់ទំនងក្នុងទិដ្ឋភាពផ្ទាល់ខ្លួន"</string>
<string name="listSingleContact" msgid="8525131203887307088">"ទំនាក់ទំនងទោល"</string>
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"បញ្ឈប់ការស្វែងរក"</string>
<string name="description_clear_search" msgid="3893511425518852086">"សម្អាតការស្វែងរក"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"ជម្រើសបង្ហាញទំនាក់ទំនង"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"ជ្រើសគណនី"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index d36baaa..b951a35 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -240,7 +240,7 @@
<string name="contactsFavoritesLabel" msgid="1222038757062409949">"ಮೆಚ್ಚಿನವುಗಳು"</string>
<string name="listTotalAllContactsZero" msgid="6041341919823872732">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
<string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"ಯಾವುದೇ ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
- <string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"ಯಾವುದೇ ಮೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ."</string>
+ <string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"ಯಾವುದೇ ಮೆಚ್ಚನವುಗಳಿಲ್ಲ."</string>
<string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> ರಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
<string name="menu_clear_frequents" msgid="8492322695770647639">"ಪುನರಾವರ್ತನೆಗಳನ್ನು ತೆರುವುಗೊಳಿಸಿ"</string>
<string name="menu_select_sim" msgid="7814841439832447299">"SIM ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 518c9ff..77e9e0f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"검색 중지"</string>
<string name="description_clear_search" msgid="3893511425518852086">"검색창 지우기"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"연락처 표시 옵션"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"계정 선택"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a10a95f..68c050c 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -99,7 +99,7 @@
<string name="name_phonetic" msgid="2249169131785620210">"ການອອກສຽງຊື່"</string>
<string name="name_phonetic_given" msgid="2863316331175661852">"ການອອກສຽງຊື່"</string>
<string name="name_phonetic_middle" msgid="5970174427249235577">"ການອອກສຽງຊື່ກາງ"</string>
- <string name="name_phonetic_family" msgid="1572398622239414464">"ການອອກສຽງນາມສະກຸນ"</string>
+ <string name="name_phonetic_family" msgid="1572398622239414464">"ການອອກສຽງນາມສະກຸນ"</string>
<string name="phoneLabelsGroup" msgid="7913782787902007482">"ໂທລະສັບ"</string>
<string name="emailLabelsGroup" msgid="4696310712601184208">"ອີເມວ"</string>
<string name="postalLabelsGroup" msgid="3727124282406728557">"ທີ່ຢູ່"</string>
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ຢຸດການຊອກຫາ"</string>
<string name="description_clear_search" msgid="3893511425518852086">"ລຶບການຊອກຫາ"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"ໂຕເລືອກການສະແດງລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"ເລືອກບັນຊີ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b9f851b..67303f9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"sustabdyti paiešką"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Išvalyti paiešką"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktų rodymo parinktys"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Pasirinkite paskyrą"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6469c38..8484056 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"pārtraukt meklēšanu"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Notīrīt meklēšanas lauku"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktpersonu rādīšanas opcijas"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Konta atlase"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index f735270..e0e1bf9 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -253,4 +253,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"хайлтыг зогсоох"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Хайлтыг цэвэрлэх"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Харилцагчийн харагдах сонголт"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Акаунт сонгох"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 27a8656..7ec1e62 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -253,4 +253,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"berhenti mencari"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Kosongkan carian"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Pilihan paparan kenalan"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Pilih Akaun"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index f85f701..c694ce9 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -155,7 +155,7 @@
<string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"\"<xliff:g id="GROUP">%s</xliff:g>\" အား ထပ်တူပြုလုပ်ခြင်းမှ ဖယ်ထုတ်ခြင်းသည် တခြား အုပ်စုမလုပ်ထားသော အဆက်အသွယ်များအားလည်း ဖယ်ထုတ်ပါလိမ့်မည်။"</string>
<string name="savingDisplayGroups" msgid="6863012138107446030">"ပြသမှု ရွေးချယ်ခြင်းများ သိမ်းဆည်နေစဉ်…"</string>
<string name="menu_done" msgid="32470053723443112">"ပြီးပါပြီ"</string>
- <string name="menu_doNotSave" msgid="6012426160993364871">"ထားတော့"</string>
+ <string name="menu_doNotSave" msgid="6012426160993364871">"ပယ်ဖျက်သည်"</string>
<string name="listAllContactsInAccount" msgid="755499980092808715">"<xliff:g id="NAME">%s</xliff:g> ထဲမှ အဆက်အသွယ်များ"</string>
<string name="listCustomView" msgid="1915154113477432033">"မိမိစိတ်ကြိုက် မြင်ကွင်းမှ"</string>
<string name="listSingleContact" msgid="8525131203887307088">"အဆက်အသွယ်တစ်ခုတည်း"</string>
@@ -165,7 +165,7 @@
<string name="import_from_sdcard" product="default" msgid="6423964533801496764">"သိုလှောင်ရာနေရာမှ အထဲသို့သွင့်ရန်"</string>
<string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> ကို အထဲသို့သွင်းခြင်းအား ရပ်တန့်မလား?"</string>
<string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> ကိုအပြင်သို့ထုတ်ခြင်းအား ရပ်တန့်မလား?"</string>
- <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"လိပ်စာကဒ် အသွင်း၊အထုတ်ကို ရပ်၍မရပါ"</string>
+ <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"လိပ်စာကဒ် အသွင်း၊အထုတ်ကို ရပ်တန့်လို့မရပါ"</string>
<string name="fail_reason_unknown" msgid="8541352164960008557">"အမည်မသိသော မှားယွင်းမှု"</string>
<string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ကို ဖွင့်မရပါ: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"အပြင်ထုတ်သောစနစ်အား စတင်လို့မရပါ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
@@ -229,7 +229,7 @@
<string name="display_options_view_given_name_first" msgid="7283772578267332801">"ပထမ အမည် ဦးစွာ"</string>
<string name="display_options_view_family_name_first" msgid="8133167685885174166">"နောက်ဆုံး အမည် ဦးစွာ"</string>
<string name="share_visible_contacts" msgid="2150662668080757107">"မြင်နိုင်သော အဆက်အသွယ်များအား မျှဝေပါ"</string>
- <string name="dialog_import_export" msgid="1125776851100740858">"အဆက်အသွယ်များ သွင်းယူ၊ ထုတ်ယူရန်"</string>
+ <string name="dialog_import_export" msgid="1125776851100740858">"အဆက်အသွယ်များအား အသွင်း၊အထုတ် လုပ်ခြင်း"</string>
<string name="dialog_import" msgid="5177004290082451296">"အဆက်အသွယ်များ တင်သွင်းပါ"</string>
<string name="share_error" msgid="665756457151793108">"ဒီလိပ်စာအား မျှဝေလို့ မရပါ"</string>
<string name="menu_search" msgid="7464453023659824700">"ရှာဖွေခြင်း"</string>
@@ -245,7 +245,7 @@
<string name="menu_clear_frequents" msgid="8492322695770647639">"မကြာခဏအရာများအား ဖယ်ရှားရန်"</string>
<string name="menu_select_sim" msgid="7814841439832447299">"SIM ကဒ်ကို ရွေးရန်"</string>
<string name="menu_accounts" msgid="795417468541517082">"အကောင့်များ"</string>
- <string name="menu_import_export" msgid="6446229463809981669">"သွင်းယူ၊ ထုတ်ယူခြင်း"</string>
+ <string name="menu_import_export" msgid="6446229463809981669">"အသွင်း၊အထုတ် လုပ်ခြင်း"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတဆင့်"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="SOURCE">%2$s</xliff:g> မှတဆင့် <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ရှာဖွေမှုကို ရပ်ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8ffcd0c..9821b2d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"avslutt søket"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Slett søket"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Alternativer for visning av kontakter"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Velg konto"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9bd385a..4c4cf64 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"stoppen met zoeken"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Zoekopdracht wissen"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opties voor contactweergave"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Account selecteren"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5fa593c..8367944 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"zatrzymaj wyszukiwanie"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Wyczyść wyszukiwanie"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcje wyświetlania kontaktów"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Wybierz konto"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 93949c1..565141c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opções de visualização de contactos"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Selecionar conta"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index fedd1b4..f28ce28 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opções de exibição de contato"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Selecionar conta"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5e1d214..c851af3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"nu mai căutați"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Ștergeți căutarea"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opțiuni de afișare pentru persoanele de contact"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Selectați un cont"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index abcd3b7..1c08ce3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"прекратить поиск"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Очистить условия поиска"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Отображение контактов"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Выберите аккаунт"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3e44428..1119286 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"zastaviť vyhľadávanie"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Vymazať vyhľadávanie"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti zobrazenia kontaktov"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Výber účtu"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 111e7c1..5bb0694 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ustavitev iskanja"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Počisti iskalno polje"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti prikaza stikov"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Izbira računa"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 480feed..ca0e02c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"заустављање претраживања"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Брисање претраге"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Опције приказивања контаката"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Изаберите налог"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 18932a9..f1366ef 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"avbryt sökning"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Rensa sökning"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Visningsalternativ för kontakter"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Välj konto"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3f815d1..274cfb7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -253,4 +253,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"acha kutafuta"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Futa utafutaji"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Chaguo za onyesho la anwani"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Chagua Akaunti"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index b1e6200..c02a03a 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -160,7 +160,7 @@
<string name="listCustomView" msgid="1915154113477432033">"தனிப்பயன் காட்சியில் உள்ள தொடர்புகள்"</string>
<string name="listSingleContact" msgid="8525131203887307088">"ஒரு தொடர்பு"</string>
<string name="dialog_new_contact_account" msgid="4107520273478326011">"கணக்கின் கீழ் தொடர்பை உருவாக்கு"</string>
- <string name="import_from_sim" msgid="4749894687871835873">"சிம் கார்டிலிருந்து இறக்குமதிசெய்"</string>
+ <string name="import_from_sim" msgid="4749894687871835873">"SIM கார்டிலிருந்து இறக்குமதிசெய்"</string>
<string name="import_from_sim_number" msgid="1232500923375370101">"SIM கார்டு #<xliff:g id="SIM_NUMBER">%d</xliff:g> இலிருந்து இறக்கு"</string>
<string name="import_from_sdcard" product="default" msgid="6423964533801496764">"சேமிப்பிடத்திலிருந்து இறக்குமதிசெய்"</string>
<string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> இன் இறக்குமதியை ரத்துசெய்யவா?"</string>
@@ -229,7 +229,7 @@
<string name="display_options_view_given_name_first" msgid="7283772578267332801">"முதல் பெயர் முதலில்"</string>
<string name="display_options_view_family_name_first" msgid="8133167685885174166">"இறுதிப் பெயர் முதலில்"</string>
<string name="share_visible_contacts" msgid="2150662668080757107">"தெரியும் தொடர்புகளைப் பகிர்"</string>
- <string name="dialog_import_export" msgid="1125776851100740858">"தொடர்புகளை இறக்கு/ஏற்று"</string>
+ <string name="dialog_import_export" msgid="1125776851100740858">"தொடர்புகளை இறக்குமதி/ஏற்றுமதி செய்தல்"</string>
<string name="dialog_import" msgid="5177004290082451296">"தொடர்புகளை இறக்குமதி செய்தல்"</string>
<string name="share_error" msgid="665756457151793108">"தொடர்பைப் பகிர முடியவில்லை."</string>
<string name="menu_search" msgid="7464453023659824700">"தேடு"</string>
@@ -243,9 +243,9 @@
<string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"பிடித்தவை எதுவும் இல்லை."</string>
<string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> இல் தொடர்புகள் இல்லை"</string>
<string name="menu_clear_frequents" msgid="8492322695770647639">"அடிக்கடி தொடர்புகொண்டவர்களை அழி"</string>
- <string name="menu_select_sim" msgid="7814841439832447299">"சிம் ஐத் தேர்ந்தெடுக்கவும்"</string>
+ <string name="menu_select_sim" msgid="7814841439832447299">"SIM ஐத் தேர்ந்தெடுக்கவும்"</string>
<string name="menu_accounts" msgid="795417468541517082">"கணக்குகள்"</string>
- <string name="menu_import_export" msgid="6446229463809981669">"இறக்கு/ஏற்று"</string>
+ <string name="menu_import_export" msgid="6446229463809981669">"இறக்குமதி/ஏற்றுமதி"</string>
<string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> வழியாக"</string>
<string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="SOURCE">%2$s</xliff:g> வழியாக <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="action_menu_back_from_search" msgid="1138551123844019647">"தேடுவதை நிறுத்து"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index c4fcff4..974477c 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -101,7 +101,7 @@
<string name="name_phonetic_middle" msgid="5970174427249235577">"ఫోనెటిక్ మధ్య పేరు"</string>
<string name="name_phonetic_family" msgid="1572398622239414464">"ఫొనెటిక్ చివరి పేరు"</string>
<string name="phoneLabelsGroup" msgid="7913782787902007482">"ఫోన్"</string>
- <string name="emailLabelsGroup" msgid="4696310712601184208">"ఇమెయిల్"</string>
+ <string name="emailLabelsGroup" msgid="4696310712601184208">"ఇమెయిల్ చేయండి"</string>
<string name="postalLabelsGroup" msgid="3727124282406728557">"చిరునామా"</string>
<string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
<string name="organizationLabelsGroup" msgid="961008074745871784">"సంస్థ"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 56676f4..a82c866 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"หยุดการค้นหา"</string>
<string name="description_clear_search" msgid="3893511425518852086">"ล้างการค้นหา"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"ตัวเลือกการแสดงรายชื่อผู้ติดต่อ"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"เลือกบัญชี"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c9193d5..3090a46 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ihinto ang paghahanap"</string>
<string name="description_clear_search" msgid="3893511425518852086">"I-clear ang paghahanap"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Mga opsyon ng display ng contact"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Pumili ng Account"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0bd3165..162227c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"aramayı durdur"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Aramayı temizle"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kişi görüntüleme seçenekleri"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Hesap Seçin"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c09bbe3..23ac0d1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"припинити пошук"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Очистити поле пошуку"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Параметри відображення контактів"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Вибрати обліковий запис"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 84543fc..22d0072 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"ngừng tìm kiếm"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Xóa tìm kiếm"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Tùy chọn hiển thị liên hệ"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Chọn tài khoản"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e86c74..eed675e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜索"</string>
<string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"选择帐户"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 146ec07..947a449 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜尋"</string>
<string name="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"聯絡人顯示選項"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"選取帳戶"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9866c6f..ca550dc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜尋"</string>
<string name="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"聯絡人顯示選項"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"選取帳戶"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5320630..54bed05 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -251,4 +251,5 @@
<string name="action_menu_back_from_search" msgid="1138551123844019647">"misa ukusesha"</string>
<string name="description_clear_search" msgid="3893511425518852086">"Sula usesho"</string>
<string name="settings_contact_display_options_title" msgid="1020420603072835628">"Izinketho zokubonisa oxhumana naye"</string>
+ <string name="select_account_dialog_title" msgid="2970151494458786440">"Khetha i-Akhawunti"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6cf20a5..3444957 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -421,8 +421,11 @@
<!-- Action string for selecting SIM for importing contacts -->
<string name="import_from_sim">Import from SIM card</string>
- <!-- Action string for selecting SIM for importing contacts, when more than one SIM card -->
- <string name="import_from_sim_number">Import from SIM card #<xliff:g id="sim_number" example="2">%d</xliff:g></string>
+ <!-- Action string for selecting a SIM subscription for importing contacts -->
+ <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
+
+ <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number -->
+ <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
<!-- Action string for selecting (USB) storage for importing contacts [CHAR LIMIT=30] -->
<string name="import_from_sdcard" product="default">Import from storage</string>
@@ -763,4 +766,6 @@
contacts to be displayed. [CHAR LIMIT=128] -->
<string name="settings_contact_display_options_title">Contact display options</string>
+ <!-- Title for Select Account Dialog [CHAR LIMIT=30] -->
+ <string name="select_account_dialog_title">Select Account</string>
</resources>
diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index ea0299c..e7e09b7 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -116,6 +116,13 @@
}
/**
+ * A variant of {@link #getCallIntent(android.net.Uri)} for calling Voicemail.
+ */
+ public static Intent getVoicemailIntent() {
+ return getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null));
+ }
+
+ /**
* A variant of {@link #getCallIntent(android.net.Uri)} but also accept a call
* origin and {@code Account} and {@code VideoCallProfile} state.
* For more information about call origin, see comments in Phone package (PhoneApp).
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 8d87714..99b8df5 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -28,7 +28,10 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract.Contacts;
+import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -47,6 +50,7 @@
import com.android.contacts.common.vcard.VCardCommonArguments;
import com.android.dialerbind.analytics.AnalyticsDialogFragment;
+import java.util.Collections;
import java.util.List;
/**
@@ -57,6 +61,7 @@
public static final String TAG = "ImportExportDialogFragment";
private static final String KEY_RES_ID = "resourceId";
+ private static final String KEY_SUBSCRIPTION_ID = "subscriptionId";
private static final String ARG_CONTACTS_ARE_AVAILABLE = "CONTACTS_ARE_AVAILABLE";
private final String[] LOOKUP_PROJECTION = new String[] {
@@ -91,15 +96,14 @@
VCardCommonArguments.ARG_CALLING_ACTIVITY);
// Adapter that shows a list of string resources
- final ArrayAdapter<Integer> adapter = new ArrayAdapter<Integer>(getActivity(),
+ final ArrayAdapter<AdapterEntry> adapter = new ArrayAdapter<AdapterEntry>(getActivity(),
R.layout.select_dialog_item) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final TextView result = (TextView)(convertView != null ? convertView :
dialogInflater.inflate(R.layout.select_dialog_item, parent, false));
- final int resId = getItem(position);
- result.setText(resId);
+ result.setText(getItem(position).mLabel);
return result;
}
};
@@ -107,21 +111,32 @@
final TelephonyManager manager =
(TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
- if (manager != null && manager.hasIccCard()
- && res.getBoolean(R.bool.config_allow_sim_import)) {
- adapter.add(R.string.import_from_sim);
- }
if (res.getBoolean(R.bool.config_allow_import_from_sdcard)) {
- adapter.add(R.string.import_from_sdcard);
+ adapter.add(new AdapterEntry(getString(R.string.import_from_sdcard),
+ R.string.import_from_sdcard));
+ }
+ if (manager != null && res.getBoolean(R.bool.config_allow_sim_import)) {
+ final List<SubInfoRecord> subInfoRecords = getAllSubInfoList();
+ if (subInfoRecords.size() == 1) {
+ adapter.add(new AdapterEntry(getString(R.string.import_from_sim),
+ R.string.import_from_sim, subInfoRecords.get(0).subId));
+ } else {
+ for (SubInfoRecord record : subInfoRecords) {
+ adapter.add(new AdapterEntry(getSubDescription(record),
+ R.string.import_from_sim, record.subId));
+ }
+ }
}
if (res.getBoolean(R.bool.config_allow_export_to_sdcard)) {
if (contactsAreAvailable) {
- adapter.add(R.string.export_to_sdcard);
+ adapter.add(new AdapterEntry(getString(R.string.export_to_sdcard),
+ R.string.export_to_sdcard));
}
}
if (res.getBoolean(R.bool.config_allow_share_visible_contacts)) {
if (contactsAreAvailable) {
- adapter.add(R.string.share_visible_contacts);
+ adapter.add(new AdapterEntry(getString(R.string.share_visible_contacts),
+ R.string.share_visible_contacts));
}
}
@@ -130,11 +145,12 @@
@Override
public void onClick(DialogInterface dialog, int which) {
boolean dismissDialog;
- final int resId = adapter.getItem(which);
+ final int resId = adapter.getItem(which).mChoiceResourceId;
switch (resId) {
case R.string.import_from_sim:
case R.string.import_from_sdcard: {
- dismissDialog = handleImportRequest(resId);
+ dismissDialog = handleImportRequest(resId,
+ adapter.getItem(which).mSubscriptionId);
break;
}
case R.string.export_to_sdcard: {
@@ -207,7 +223,7 @@
*
* @return {@code true} if the dialog show be closed. {@code false} otherwise.
*/
- private boolean handleImportRequest(int resId) {
+ private boolean handleImportRequest(int resId, long subscriptionId) {
// There are three possibilities:
// - more than one accounts -> ask the user
// - just one account -> use the account without asking the user
@@ -219,6 +235,7 @@
// Send over to the account selector
final Bundle args = new Bundle();
args.putInt(KEY_RES_ID, resId);
+ args.putLong(KEY_SUBSCRIPTION_ID, subscriptionId);
SelectAccountDialogFragment.show(
getFragmentManager(), this,
R.string.dialog_new_contact_account,
@@ -231,7 +248,7 @@
}
AccountSelectionUtil.doImport(getActivity(), resId,
- (size == 1 ? accountList.get(0) : null));
+ (size == 1 ? accountList.get(0) : null), subscriptionId);
return true; // Close the dialog.
}
@@ -240,7 +257,8 @@
*/
@Override
public void onAccountChosen(AccountWithDataSet account, Bundle extraArgs) {
- AccountSelectionUtil.doImport(getActivity(), extraArgs.getInt(KEY_RES_ID), account);
+ AccountSelectionUtil.doImport(getActivity(), extraArgs.getInt(KEY_RES_ID),
+ account, extraArgs.getLong(KEY_SUBSCRIPTION_ID));
// At this point the dialog is still showing (which is why we can use getActivity() above)
// So close it.
@@ -252,4 +270,49 @@
// See onAccountChosen() -- at this point the dialog is still showing. Close it.
dismiss();
}
+
+ /**
+ * Return the same values as {@link SubscriptionManager#getAllSubInfoList()} without relying
+ * on any hidden methods.
+ */
+ // TODO: replace with a method that doesn't make assumptions about the number of SIM slots
+ private static List<SubInfoRecord> getAllSubInfoList() {
+ final List<SubInfoRecord> subInfoRecords0 = SubscriptionManager.getSubInfoUsingSlotId(0);
+ final List<SubInfoRecord> subInfoRecords1 = SubscriptionManager.getSubInfoUsingSlotId(1);
+ if (subInfoRecords0 == null && subInfoRecords1 != null) {
+ return subInfoRecords1;
+ }
+ if (subInfoRecords0 != null && subInfoRecords1 == null) {
+ return subInfoRecords0;
+ }
+ if (subInfoRecords0 == null && subInfoRecords1 == null) {
+ return Collections.EMPTY_LIST;
+ }
+ subInfoRecords0.addAll(subInfoRecords1);
+ return subInfoRecords0;
+ }
+
+ private String getSubDescription(SubInfoRecord record) {
+ if (TextUtils.isEmpty(record.number)) {
+ // Don't include the phone number in the description, since we don't know the number.
+ return getString(R.string.import_from_sim_summary_no_number, record.displayName);
+ }
+ return getString(R.string.import_from_sim_summary, record.displayName, record.number);
+ }
+
+ private static class AdapterEntry {
+ public final String mLabel;
+ public final int mChoiceResourceId;
+ public final long mSubscriptionId;
+
+ public AdapterEntry(String label, int resId, long subscriptionId) {
+ mLabel = label;
+ mChoiceResourceId = resId;
+ mSubscriptionId = subscriptionId;
+ }
+
+ public AdapterEntry(String label, int resId) {
+ this(label, resId, SubscriptionManager.INVALID_SUB_ID);
+ }
+ }
}
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java
index ab32736..68217b9 100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java
@@ -22,6 +22,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
+import android.telephony.SubscriptionManager;
import android.util.Log;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
@@ -54,22 +55,31 @@
final private Context mContext;
final private int mResId;
+ final private long mSubscriptionId;
final protected List<AccountWithDataSet> mAccountList;
public AccountSelectedListener(Context context, List<AccountWithDataSet> accountList,
- int resId) {
+ int resId, long subscriptionId) {
if (accountList == null || accountList.size() == 0) {
Log.e(LOG_TAG, "The size of Account list is 0.");
}
mContext = context;
mAccountList = accountList;
mResId = resId;
+ mSubscriptionId = subscriptionId;
+ }
+
+ public AccountSelectedListener(Context context, List<AccountWithDataSet> accountList,
+ int resId) {
+ // Subscription id is only needed for importing from SIM card. We can safely ignore
+ // its value for SD card importing.
+ this(context, accountList, resId, SubscriptionManager.INVALID_SUB_ID);
}
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
- doImport(mContext, mResId, mAccountList.get(which));
+ doImport(mContext, mResId, mAccountList.get(which), mSubscriptionId);
}
}
@@ -150,10 +160,11 @@
.create();
}
- public static void doImport(Context context, int resId, AccountWithDataSet account) {
+ public static void doImport(Context context, int resId, AccountWithDataSet account,
+ long subscriptionId) {
switch (resId) {
case R.string.import_from_sim: {
- doImportFromSim(context, account);
+ doImportFromSim(context, account, subscriptionId);
break;
}
case R.string.import_from_sdcard: {
@@ -163,7 +174,8 @@
}
}
- public static void doImportFromSim(Context context, AccountWithDataSet account) {
+ public static void doImportFromSim(Context context, AccountWithDataSet account,
+ long subscriptionId) {
Intent importIntent = new Intent(Intent.ACTION_VIEW);
importIntent.setType("vnd.android.cursor.item/sim-contact");
if (account != null) {
@@ -171,6 +183,7 @@
importIntent.putExtra("account_type", account.type);
importIntent.putExtra("data_set", account.dataSet);
}
+ importIntent.putExtra("subscription_id", subscriptionId);
importIntent.setClassName("com.android.phone", "com.android.phone.SimContacts");
context.startActivity(importIntent);
}
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index 70c9821..62e8431 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -109,8 +109,6 @@
final static String CACHED_URIS = "cached_uris";
- private AccountSelectionUtil.AccountSelectedListener mAccountSelectionListener;
-
private AccountWithDataSet mAccount;
private ProgressDialog mProgressDialogForScanVCard;
@@ -891,14 +889,6 @@
@Override
protected Dialog onCreateDialog(int resId, Bundle bundle) {
switch (resId) {
- case R.string.import_from_sdcard: {
- if (mAccountSelectionListener == null) {
- throw new NullPointerException(
- "mAccountSelectionListener must not be null.");
- }
- return AccountSelectionUtil.getSelectAccountDialog(this, resId,
- mAccountSelectionListener, mCancelListener);
- }
case R.id.dialog_searching_vcard: {
if (mProgressDialogForScanVCard == null) {
String message = getString(R.string.searching_vcard_message);
diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
new file mode 100644
index 0000000..f88d719
--- /dev/null
+++ b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2014 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.widget;
+
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.telecom.TelecomManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import com.android.contacts.common.R;
+
+import java.util.List;
+
+/**
+ * Dialog that allows the user to switch between default SIM cards
+ */
+public class SelectPhoneAccountDialogFragment extends DialogFragment {
+ private List<PhoneAccountHandle> mAccountHandles;
+ private boolean mIsSelected;
+ private TelecomManager mTelecomManager;
+ private SelectPhoneAccountListener mListener;
+
+ /**
+ * Shows the account selection dialog.
+ * This is the preferred way to show this dialog.
+ *
+ * @param fragmentManager The fragment manager.
+ * @param accountHandles The {@code PhoneAccountHandle}s available to select from.
+ */
+ public static void showAccountDialog(FragmentManager fragmentManager,
+ List<PhoneAccountHandle> accountHandles, SelectPhoneAccountListener listener) {
+ SelectPhoneAccountDialogFragment fragment =
+ new SelectPhoneAccountDialogFragment(accountHandles, listener);
+ fragment.show(fragmentManager, "selectAccount");
+ }
+
+ public SelectPhoneAccountDialogFragment(List<PhoneAccountHandle> accountHandles,
+ SelectPhoneAccountListener listener) {
+ super();
+ mAccountHandles = accountHandles;
+ mListener = listener;
+ }
+
+ public interface SelectPhoneAccountListener {
+ void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle);
+ void onDialogDismissed();
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ mIsSelected = false;
+ mTelecomManager =
+ (TelecomManager) getActivity().getSystemService(Context.TELECOM_SERVICE);
+
+ final DialogInterface.OnClickListener selectionListener =
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ mIsSelected = true;
+ PhoneAccountHandle selectedAccountHandle = mAccountHandles.get(which);
+ mListener.onPhoneAccountSelected(selectedAccountHandle);
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+ ListAdapter selectAccountListAdapter = new SelectAccountListAdapter(
+ builder.getContext(),
+ R.layout.select_account_list_item,
+ mAccountHandles);
+
+ return builder.setTitle(R.string.select_account_dialog_title)
+ .setAdapter(selectAccountListAdapter, selectionListener)
+ .create();
+ }
+
+ private class SelectAccountListAdapter extends ArrayAdapter<PhoneAccountHandle> {
+ private Context mContext;
+ private int mResId;
+
+ public SelectAccountListAdapter(
+ Context context, int resource, List<PhoneAccountHandle> accountHandles) {
+ super(context, resource, accountHandles);
+ mContext = context;
+ mResId = resource;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ LayoutInflater inflater = (LayoutInflater)
+ mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ View rowView;
+ final ViewHolder holder;
+
+ if (convertView == null) {
+ // Cache views for faster scrolling
+ rowView = inflater.inflate(mResId, null);
+ holder = new ViewHolder();
+ holder.textView = (TextView) rowView.findViewById(R.id.text);
+ holder.imageView = (ImageView) rowView.findViewById(R.id.icon);
+ rowView.setTag(holder);
+ }
+ else {
+ rowView = convertView;
+ holder = (ViewHolder) rowView.getTag();
+ }
+
+ PhoneAccountHandle accountHandle = getItem(position);
+ PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle);
+ holder.textView.setText(account.getLabel());
+ holder.imageView.setImageDrawable(account.getIcon(mContext));
+ return rowView;
+ }
+
+ private class ViewHolder {
+ TextView textView;
+ ImageView imageView;
+ }
+ }
+
+ @Override
+ public void onPause() {
+ if (!mIsSelected) {
+ mListener.onDialogDismissed();
+ }
+ super.onPause();
+ }
+}
\ No newline at end of file