Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
Merged-In: I2f184a8c43c83c1946b8096fd59d5e04988f5100
Change-Id: I15deab71a69e61aee82bc04d4433c663ee56358f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e0814c1..52606b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -73,6 +73,7 @@
android:launchMode="singleTop"
android:resizeableActivity="true"
android:theme="@style/LaunchScreenTheme"
+ android:exported="true"
android:visibleToInstantApps="true"
>
<intent-filter>
@@ -183,6 +184,7 @@
android:theme="@style/ContactPickerTheme"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustResize"
+ android:exported="true"
android:visibleToInstantApps="true">
<meta-data android:name="android.app.shortcuts.new_config"
android:value="true" />
@@ -285,6 +287,7 @@
<activity
android:name=".activities.ShowOrCreateActivity"
+ android:exported="true"
android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
<intent-filter>
@@ -302,6 +305,7 @@
android:launchMode="singleTop"
android:taskAffinity=""
android:theme="@style/Theme.QuickContact"
+ android:exported="true"
android:windowSoftInputMode="stateUnchanged">
<intent-filter>
@@ -330,7 +334,8 @@
<!-- Responsible for creating notification channels when boot is completed or when app is
re-installed -->
- <receiver android:name=".interactions.OnBootOrUpgradeReceiver">
+ <receiver android:name=".interactions.OnBootOrUpgradeReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -341,6 +346,7 @@
android:name="ContactShortcut"
android:icon="@drawable/logo_quick_contacts_color_44in48dp"
android:label="@string/shortcutContact"
+ android:exported="true"
android:targetActivity=".activities.ContactSelectionActivity">
<intent-filter>
@@ -354,6 +360,7 @@
android:name="alias.DialShortcut"
android:icon="@drawable/logo_quick_contacts_dialer_color_44in48dp"
android:label="@string/shortcutDialContact"
+ android:exported="true"
android:targetActivity=".activities.ContactSelectionActivity">
<intent-filter>
@@ -369,6 +376,7 @@
android:name="alias.MessageShortcut"
android:icon="@drawable/logo_quick_contacts_mail_color_44in48dp"
android:label="@string/shortcutMessageContact"
+ android:exported="true"
android:targetActivity=".activities.ContactSelectionActivity">
<intent-filter>
@@ -388,6 +396,7 @@
<!-- Edit or create a contact with only the most important fields displayed initially. -->
<activity
android:name=".activities.ContactEditorActivity"
+ android:exported="true"
android:theme="@style/EditorActivityTheme">
<intent-filter>
@@ -417,6 +426,7 @@
<activity
android:name=".activities.ContactEditorSpringBoardActivity"
+ android:exported="true"
android:theme="@style/TransparentThemeAppCompat">
<intent-filter>
@@ -429,7 +439,8 @@
</intent-filter>
</activity>
- <activity android:name=".test.FragmentTestActivity">
+ <activity android:name=".test.FragmentTestActivity"
+ android:exported="true">
<intent-filter>
<category android:name="android.intent.category.TEST"/>
</intent-filter>
@@ -455,6 +466,7 @@
<activity
android:name=".activities.AttachPhotoActivity"
android:label="@string/attach_photo_dialog_title"
+ android:exported="true"
android:taskAffinity="">
<intent-filter>
<action android:name="android.intent.action.ATTACH_DATA"/>
@@ -467,6 +479,7 @@
<activity
android:name=".vcard.ImportVCardActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
+ android:exported="true"
android:theme="@style/BackgroundOnlyTheme">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
@@ -482,6 +495,7 @@
<activity
android:name=".vcard.NfcImportVCardActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
+ android:exported="true"
android:theme="@style/BackgroundOnlyTheme">
<intent-filter>
<action android:name="android.nfc.action.NDEF_DISCOVERED"/>
@@ -527,6 +541,7 @@
are set lower, so that the user does not see a disambig dialog -->
<activity
android:name="com.android.contacts.NonPhoneActivity"
+ android:exported="true"
android:theme="@style/NonPhoneActivityTheme">
<intent-filter android:priority="-1">
<action android:name="android.intent.action.MAIN"/>
@@ -555,6 +570,7 @@
<activity
android:name="com.android.contacts.dialog.CallSubjectDialog"
android:theme="@style/Theme.CallSubjectDialogTheme"
+ android:exported="true"
android:windowSoftInputMode="stateVisible|adjustResize">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/res/layout-land/contact_editor_fragment.xml b/res/layout-land/contact_editor_fragment.xml
index 6f026aa..e68d7a3 100644
--- a/res/layout-land/contact_editor_fragment.xml
+++ b/res/layout-land/contact_editor_fragment.xml
@@ -31,7 +31,7 @@
<include layout="@layout/photo_editor_view" />
- <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
+ <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
diff --git a/res/layout/contact_editor_fragment.xml b/res/layout/contact_editor_fragment.xml
index 03a84e1..694e1f6 100644
--- a/res/layout/contact_editor_fragment.xml
+++ b/res/layout/contact_editor_fragment.xml
@@ -38,7 +38,7 @@
<include layout="@layout/photo_editor_view" />
- <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
+ <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
diff --git a/res/layout/menu_item_action_view.xml b/res/layout/menu_item_action_view.xml
index 62eb758..1f8066e 100644
--- a/res/layout/menu_item_action_view.xml
+++ b/res/layout/menu_item_action_view.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
-<!-- A dummy action view to attach extra hidden content description to menuItem for Talkback. -->
+<!-- A placeholder action view to attach extra hidden content description to
+ menuItem for Talkback. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -24,4 +25,4 @@
<View
android:layout_width="1dp"
android:layout_height= "1dp" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 926fe45..db8ec9e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -466,7 +466,7 @@
<string name="activity_title_contacts_filter" msgid="6340531582631006680">"Адлюстроўваць кантакты"</string>
<string name="custom_list_filter" msgid="2544327670202891979">"Наладзіць прагляд"</string>
<string name="menu_custom_filter_save" msgid="2412959737200856930">"Захаваць"</string>
- <string name="hint_findContacts" msgid="5554298639062659655">"Шукаць у кантактах"</string>
+ <string name="hint_findContacts" msgid="5554298639062659655">"Пошук кантактаў"</string>
<string name="contactsFavoritesLabel" msgid="8339645684721732714">"Выбранае"</string>
<string name="menu_import" msgid="2206768098740726906">"Імпартаваць"</string>
<string name="menu_export" msgid="1217402092617629429">"Экспартаваць"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b24ddb4..95db5a7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -471,11 +471,11 @@
<string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
<string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
<string name="about_build_version" msgid="5870642814752351712">"Versión de la compilación"</string>
- <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de código abierto"</string>
+ <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de software libre"</string>
<string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Detalles de las licencias de software libre"</string>
<string name="about_privacy_policy" msgid="4581488375200402678">"Política de Privacidad"</string>
- <string name="about_terms_of_service" msgid="7419670771785057738">"Condiciones de Servicio"</string>
- <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de código abierto"</string>
+ <string name="about_terms_of_service" msgid="7419670771785057738">"Términos del Servicio"</string>
+ <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de software libre"</string>
<string name="url_open_error_toast" msgid="4885855620824048385">"No se ha podido abrir la URL."</string>
<string name="account_filter_view_checked" msgid="4740544238806346376">"Se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
<string name="account_filter_view_not_checked" msgid="5782705545786455847">"No se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 83ef3cf..7cc9320 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,7 +29,7 @@
<string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Créer un contact"</string>
<string name="searchHint" msgid="1487501532610025473">"Rech. des contacts"</string>
<string name="menu_addStar" msgid="4903812703386825130">"Ajouter aux favoris"</string>
- <string name="menu_removeStar" msgid="3707373931808303701">"Supprimer des favoris"</string>
+ <string name="menu_removeStar" msgid="3707373931808303701">"Retirer des favoris"</string>
<string name="description_action_menu_remove_star" msgid="4044390281910122890">"Supprimé des favoris"</string>
<string name="description_action_menu_add_star" msgid="7316521132809388851">"Ajouté aux favoris"</string>
<string name="menu_editContact" msgid="5039663761025630208">"Modifier"</string>
@@ -37,7 +37,7 @@
<string name="menu_change_photo" msgid="4911246106907208055">"Changer de photo"</string>
<string name="menu_create_contact_shortcut" msgid="8983436328557825860">"Créer un raccourci"</string>
<string name="menu_splitAggregate" msgid="2062290275288905833">"Annuler la fusion"</string>
- <string name="menu_editGroup" msgid="8706562583754054622">"Supprimer les contacts"</string>
+ <string name="menu_editGroup" msgid="8706562583754054622">"Retirer les contacts"</string>
<string name="menu_renameGroup" msgid="2685886609399776475">"Renommer l\'étiquette"</string>
<string name="menu_deleteGroup" msgid="1180215594530228294">"Supprimer l\'étiquette"</string>
<string name="menu_addToGroup" msgid="5034813446697655310">"Ajouter un contact"</string>
@@ -183,7 +183,7 @@
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Annuler"</string>
<string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Supprimer les personnalisations?"</string>
<string name="enter_contact_name" msgid="521859148893732679">"Rechercher dans les contacts"</string>
- <string name="title_edit_group" msgid="4246193439931854759">"Supprimer les contacts"</string>
+ <string name="title_edit_group" msgid="4246193439931854759">"Retirer les contacts"</string>
<string name="local_profile_title" msgid="1613784248702623410">"Mon profil local"</string>
<string name="external_profile_title" msgid="2706282819025406927">"Mon profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Prenez une minute pour ajouter un compte qui sauvegardera vos contacts sur Google."</string>
@@ -369,7 +369,7 @@
<string name="list_filter_single" msgid="6003845379327432129">"contact"</string>
<string name="display_ungrouped" msgid="4823012484407759332">"Tous les autres contacts"</string>
<string name="display_all_contacts" msgid="1281067776483704512">"Tous les contacts"</string>
- <string name="menu_sync_remove" msgid="7523335046562082188">"Supprimer le groupe de synchronisation"</string>
+ <string name="menu_sync_remove" msgid="7523335046562082188">"Retirer le groupe de synchronisation"</string>
<string name="dialog_sync_add" msgid="8012361965908515959">"Ajouter groupe de synchronisation"</string>
<string name="display_more_groups" msgid="8398232980355188133">"Autres groupes…"</string>
<string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Le retrait du groupe \"<xliff:g id="GROUP">%s</xliff:g>\" de la synchronisation entraîne également le retrait des contacts n\'appartenant à aucun groupe."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 3e5fc09..0448ecf 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -310,10 +310,10 @@
<string name="name_prefix" msgid="8857117624713905211">"Forma de tratamento"</string>
<string name="name_middle" msgid="7330498948136181042">"Segundo nome"</string>
<string name="name_suffix" msgid="4502958221763936999">"Título académico ou profesional"</string>
- <string name="name_phonetic" msgid="4746541275769990740">"Nome fonético"</string>
- <string name="name_phonetic_given" msgid="425534279190047812">"Nome fonético"</string>
- <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome fonético"</string>
- <string name="name_phonetic_family" msgid="1690852801039809448">"Apelido fonético"</string>
+ <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronunciación)"</string>
+ <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronunciación)"</string>
+ <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronunciación)"</string>
+ <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronunciación)"</string>
<string name="phoneLabelsGroup" msgid="2746758650001801885">"Teléfono"</string>
<string name="emailLabelsGroup" msgid="3360719560200449554">"Correo electrónico"</string>
<string name="postalLabelsGroup" msgid="7534317297587527570">"Enderezo"</string>
@@ -357,8 +357,8 @@
<string name="description_minus_button" msgid="1305985971158054217">"eliminar"</string>
<string name="expand_name_fields_description" msgid="6059558159338959487">"Mostrar máis campos de nome"</string>
<string name="collapse_name_fields_description" msgid="7950435675716414477">"Contraer campos de nome"</string>
- <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"Mostrar máis campos de nome fonético"</string>
- <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"Contraer campos de nome fonético"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"Mostrar máis campos de pronuncia do nome"</string>
+ <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"Contraer campos de pronuncia do nome"</string>
<string name="expand_fields_description" msgid="8604448646798943909">"Despregar"</string>
<string name="collapse_fields_description" msgid="3213872920491992960">"Contraer"</string>
<string name="announce_expanded_fields" msgid="8410808184164186871">"Despregado"</string>
@@ -430,7 +430,7 @@
<string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar a ficheiro .vcf"</string>
<string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
- <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
+ <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronunciación)"</string>
<string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se está baleiro"</string>
<string name="display_options_sort_by_given_name" msgid="893781924536349248">"Nome"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1ee67df..22da670 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -310,10 +310,10 @@
<string name="name_prefix" msgid="8857117624713905211">"નામ ઉપસર્ગ"</string>
<string name="name_middle" msgid="7330498948136181042">"પિતા/પતિનું નામ"</string>
<string name="name_suffix" msgid="4502958221763936999">"નામ પ્રત્યય"</string>
- <string name="name_phonetic" msgid="4746541275769990740">"ધ્વન્યાત્મક નામ"</string>
- <string name="name_phonetic_given" msgid="425534279190047812">"ધ્વન્યાત્મક નામ"</string>
- <string name="name_phonetic_middle" msgid="6528822054594516485">"ધ્વન્યાત્મક પિતા/પતિનું નામ"</string>
- <string name="name_phonetic_family" msgid="1690852801039809448">"ધ્વન્યાત્મક અટક"</string>
+ <string name="name_phonetic" msgid="4746541275769990740">"ફોનેટિક નામ"</string>
+ <string name="name_phonetic_given" msgid="425534279190047812">"ફોનેટિક નામ"</string>
+ <string name="name_phonetic_middle" msgid="6528822054594516485">"ફોનેટિક પિતા/પતિનું નામ"</string>
+ <string name="name_phonetic_family" msgid="1690852801039809448">"ફોનેટિક અટક"</string>
<string name="phoneLabelsGroup" msgid="2746758650001801885">"ફોન"</string>
<string name="emailLabelsGroup" msgid="3360719560200449554">"ઇમેઇલ"</string>
<string name="postalLabelsGroup" msgid="7534317297587527570">"સરનામું"</string>
@@ -357,8 +357,8 @@
<string name="description_minus_button" msgid="1305985971158054217">"કાઢી નાખો"</string>
<string name="expand_name_fields_description" msgid="6059558159338959487">"વધુ નામ ફીલ્ડ્સ બતાવો"</string>
<string name="collapse_name_fields_description" msgid="7950435675716414477">"નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
- <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ધ્વન્યાત્મક નામ ફીલ્ડ્સ બતાવો"</string>
- <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ધ્વન્યાત્મક નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ફોનેટિક નામ ફીલ્ડ બતાવો"</string>
+ <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ફોનેટિક નામ ફીલ્ડ સંકુચિત કરો"</string>
<string name="expand_fields_description" msgid="8604448646798943909">"વિસ્તૃત કરો"</string>
<string name="collapse_fields_description" msgid="3213872920491992960">"સંકુચિત કરો"</string>
<string name="announce_expanded_fields" msgid="8410808184164186871">"વિસ્તૃત કર્યું"</string>
@@ -430,7 +430,7 @@
<string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ફાઇલ પર નિકાસ કરો"</string>
<string name="display_options_sort_list_by" msgid="4333658089057400431">"આ પ્રમાણે સૉર્ટ કરો"</string>
- <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ધ્વન્યાત્મક નામ"</string>
+ <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ફોનેટિક નામ"</string>
<string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"હંમેશા બતાવો"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"જો ખાલી હોય તો છુપાવો"</string>
<string name="display_options_sort_by_given_name" msgid="893781924536349248">"નામ"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index ec56c2a..e20401e 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -503,7 +503,7 @@
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Միացնել"</string>
<string name="connection_error_message" msgid="7446131881946138093">"Կապ չկա"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"SIM քարտ"</string>
- <string name="show_more_content_description" msgid="6298277298495491712">"Ցուցադրել ավելի շատ"</string>
+ <string name="show_more_content_description" msgid="6298277298495491712">"Ցույց տալ ավելի շատ"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"SIM քարտի ներմուծումն ավարտվեց"</string>
<string name="importing_sim_failed_title" msgid="1046154274170241788">"Ներմուծման սխալ"</string>
<string name="importing_sim_failed_message" msgid="55568522164349044">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a200960..5cfc832 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -137,7 +137,7 @@
<string name="search_settings_description" msgid="5630675648560839920">"השמות של אנשי הקשר"</string>
<string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"לחץ כדי לחזור אל המסך הקודם"</string>
<string name="quickcontact_add_phone_number" msgid="1683577288080727862">"הוספת מספר טלפון"</string>
- <string name="quickcontact_add_email" msgid="1442894568471116797">"הוסף אימייל"</string>
+ <string name="quickcontact_add_email" msgid="1442894568471116797">"הוספת אימייל"</string>
<string name="missing_app" msgid="5674389915738964148">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
<string name="menu_share" msgid="6343022811796001773">"שיתוף"</string>
<string name="menu_add_contact" msgid="5822356185421997656">"הוספה לאנשי הקשר"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a5adb6b..6afb2ec 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -454,7 +454,7 @@
<string name="activity_title_contacts_filter" msgid="6340531582631006680">"Көрсөтүлүүчү байланыштар"</string>
<string name="custom_list_filter" msgid="2544327670202891979">"Тандап көрсөтүү"</string>
<string name="menu_custom_filter_save" msgid="2412959737200856930">"Сактоо"</string>
- <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издеңиз"</string>
+ <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издөө"</string>
<string name="contactsFavoritesLabel" msgid="8339645684721732714">"Cүйүктүүлөр"</string>
<string name="menu_import" msgid="2206768098740726906">"Өткөрүп алуу"</string>
<string name="menu_export" msgid="1217402092617629429">"Өткөрүп берүү"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f07b0e5..fa23883 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -311,9 +311,9 @@
<string name="name_middle" msgid="7330498948136181042">"മിഡിൽ നെയിം"</string>
<string name="name_suffix" msgid="4502958221763936999">"പേരിന്റെ സഫിക്സ്"</string>
<string name="name_phonetic" msgid="4746541275769990740">"ഉച്ചാരണപ്രകാരമുള്ള പേര്"</string>
- <string name="name_phonetic_given" msgid="425534279190047812">"ഫസ്റ്റ് നെയിം"</string>
+ <string name="name_phonetic_given" msgid="425534279190047812">"ഉച്ചാരണപ്രകാരമുള്ള ഫസ്റ്റ് നെയിം"</string>
<string name="name_phonetic_middle" msgid="6528822054594516485">"ഉച്ചാരണപ്രകാരമുള്ള മിഡിൽ നെയിം"</string>
- <string name="name_phonetic_family" msgid="1690852801039809448">"പേരിന്റെ അവസാന ഭാഗം"</string>
+ <string name="name_phonetic_family" msgid="1690852801039809448">"ഉച്ചാരണപ്രകാരമുള്ള ലാസ്റ്റ് നെയിം"</string>
<string name="phoneLabelsGroup" msgid="2746758650001801885">"ഫോണ്"</string>
<string name="emailLabelsGroup" msgid="3360719560200449554">"ഇമെയില്"</string>
<string name="postalLabelsGroup" msgid="7534317297587527570">"വിലാസം"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 63b998e..589f488 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -459,8 +459,8 @@
<string name="menu_import" msgid="2206768098740726906">"ထည့်သွင်းရန်"</string>
<string name="menu_export" msgid="1217402092617629429">"ထုတ်ယူရန်"</string>
<string name="menu_blocked_numbers" msgid="7064680515202657609">"ပိတ်ဆို့နံပါတ်များ"</string>
- <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတဆင့်"</string>
- <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> မှတဆင့်"</string>
+ <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတစ်ဆင့်"</string>
+ <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> မှတစ်ဆင့်"</string>
<string name="action_menu_back_from_search" msgid="683765774264585732">"ရှာဖွေမှုရပ်ရန်"</string>
<string name="description_clear_search" msgid="1852934085825794095">"ရှာဖွေမှုကို ရှင်းပါ"</string>
<string name="select_account_dialog_title" msgid="5047523441152129207">"အကောင့်"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 42352da..dee6f5e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
<string name="description_action_menu_add_star" msgid="7316521132809388851">"मनपर्नेमा थपियो"</string>
<string name="menu_editContact" msgid="5039663761025630208">"सम्पादन गर्नुहोस्"</string>
<string name="menu_deleteContact" msgid="15161764025276217">"मेट्नुहोस्"</string>
- <string name="menu_change_photo" msgid="4911246106907208055">"तस्बिर परिवर्तन गर्नुहोस्"</string>
+ <string name="menu_change_photo" msgid="4911246106907208055">"फोटो परिवर्तन गर्नुहोस्"</string>
<string name="menu_create_contact_shortcut" msgid="8983436328557825860">"सर्टकट सिर्जना गर्नुहोस्"</string>
<string name="menu_splitAggregate" msgid="2062290275288905833">"अनलिंक"</string>
<string name="menu_editGroup" msgid="8706562583754054622">"सम्पर्कहरू हटाउनुहोस्"</string>
@@ -95,10 +95,10 @@
<string name="invalidContactMessage" msgid="6204402264821083362">"सम्पर्क उपलब्ध छैन।"</string>
<string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"सम्पर्क गृह स्क्रिनमा थपियो।"</string>
<string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> गृह स्क्रिनमा थपियो।"</string>
- <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि तस्बिरहरू उपलब्ध छैनन्।"</string>
- <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क तस्बिर"</string>
+ <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि फोटोहरू उपलब्ध छैनन्।"</string>
+ <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क फोटो"</string>
<string name="customLabelPickerTitle" msgid="816694850254307154">"आफू अनुकूल पारिएको लेबलको नाम"</string>
- <string name="removePhoto" msgid="1190099414600730001">"तस्बिर मेट्नुहोस्"</string>
+ <string name="removePhoto" msgid="1190099414600730001">"फोटो मेट्नुहोस्"</string>
<string name="noContacts" msgid="3030512741779213810">"तपाईंको सम्पर्क ठेगानाहरूको सूची खाली छ"</string>
<string name="emptyGroup" msgid="8598261660865081152">"यो लेबल अन्तर्गत कुनै सम्पर्कहरू छैनन्"</string>
<string name="emptyAccount" msgid="7450843210977018582">"यस खातामा कुनै सम्पर्क ठेगानाहरू छैनन्"</string>
@@ -149,10 +149,10 @@
<string name="video_chat" msgid="2477295971622477433">"भिडियो च्याट"</string>
<string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> सम्पर्क"</string>
<string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> खाता"</string>
- <string name="take_photo" msgid="820071555236547516">"तस्बिर लिनुहोस्"</string>
- <string name="take_new_photo" msgid="4383091978116875778">"नयाँ तस्बिर खिच्नुहोस्"</string>
- <string name="pick_photo" msgid="2050859661654812588">"तस्बिर छान्नुहोस्"</string>
- <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ तस्बिर चयन गर्नुहोस्"</string>
+ <string name="take_photo" msgid="820071555236547516">"फोटो लिनुहोस्"</string>
+ <string name="take_new_photo" msgid="4383091978116875778">"नयाँ फोटो खिच्नुहोस्"</string>
+ <string name="pick_photo" msgid="2050859661654812588">"फोटो छान्नुहोस्"</string>
+ <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ फोटो चयन गर्नुहोस्"</string>
<string name="search_results_searching" msgid="1373859095361975648">"खोजी कार्य गर्दै..."</string>
<string name="event_edit_field_hint_text" msgid="1720286136507504896">"मिति"</string>
<string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
@@ -217,9 +217,9 @@
<string name="header_phone_entry" msgid="7092868248113091293">"फोन"</string>
<string name="content_description_directions" msgid="860179347986211929">"स्थानको लागि निर्देशनहरू"</string>
<string name="editor_more_fields" msgid="6158558083947445518">"थप क्षेत्रहरू"</string>
- <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको तस्बिर बदल्नुहोस्"</string>
- <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको तस्बिर थप्नुहोस्"</string>
- <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको तस्बिर"</string>
+ <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको फोटो बदल्नुहोस्"</string>
+ <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको फोटो थप्नुहोस्"</string>
+ <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको फोटो"</string>
<string name="editor_failed_to_load" msgid="2328074829787373644">"सम्पादक खोल्न सकिएन।"</string>
<string name="editor_account_selector_title" msgid="3190515989740696043">"यसमा सुरक्षित गरिँदै"</string>
<string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g> को सम्पर्क सम्बन्धी जानकारी सम्पादन गर्न मिल्दैन"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6478cf2..011fe04 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -241,7 +241,7 @@
<string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Organiseer je contacten op een overzichtelijke en nuttige manier"</string>
<string name="undo" msgid="2446931036220975026">"Ongedaan maken"</string>
<string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
- <string name="call_home" msgid="2443904771140750492">"Bellen naar huis"</string>
+ <string name="call_home" msgid="2443904771140750492">"Thuis bellen"</string>
<string name="call_mobile" msgid="6504312789160309832">"Bellen naar mobiel"</string>
<string name="call_work" msgid="2414313348547560346">"Bellen naar werk"</string>
<string name="call_fax_work" msgid="5026843006300760797">"Bellen naar fax werk"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 921b145..83f300e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -310,10 +310,10 @@
<string name="name_prefix" msgid="8857117624713905211">"Murojaat shakli"</string>
<string name="name_middle" msgid="7330498948136181042">"Otasining ismi"</string>
<string name="name_suffix" msgid="4502958221763936999">"Martabasi/unvoni"</string>
- <string name="name_phonetic" msgid="4746541275769990740">"Ism talaffuzi"</string>
- <string name="name_phonetic_given" msgid="425534279190047812">"Ism talaffuzi"</string>
- <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi talaffuzi"</string>
- <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya talaffuzi"</string>
+ <string name="name_phonetic" msgid="4746541275769990740">"Ism transkripsiyasi"</string>
+ <string name="name_phonetic_given" msgid="425534279190047812">"Ism transkripsiyasi"</string>
+ <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi transkripsiyasi"</string>
+ <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya transkripsiyasi"</string>
<string name="phoneLabelsGroup" msgid="2746758650001801885">"Telefon"</string>
<string name="emailLabelsGroup" msgid="3360719560200449554">"Email"</string>
<string name="postalLabelsGroup" msgid="7534317297587527570">"Manzil"</string>
@@ -430,7 +430,7 @@
<string name="progress_notifier_message" msgid="8522060892889599746">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> – <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="3096479544575798192">"VCF faylga eksport qilish"</string>
<string name="display_options_sort_list_by" msgid="4333658089057400431">"Saralash"</string>
- <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism talaffuzi"</string>
+ <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism transkripsiyasi"</string>
<string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Har doim ko‘rsatish"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Bo‘sh maydonni berkitish"</string>
<string name="display_options_sort_by_given_name" msgid="893781924536349248">"Ismi"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f35bf54..e22d44c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -241,7 +241,7 @@
<string name="hamburger_feature_highlight_body" msgid="782935036630531528">"讓你的聯絡人資料井然有序又實用"</string>
<string name="undo" msgid="2446931036220975026">"復原"</string>
<string name="call_custom" msgid="2844900154492073207">"撥打<xliff:g id="CUSTOM_LABEL">%s</xliff:g>電話號碼"</string>
- <string name="call_home" msgid="2443904771140750492">"去電住家電話"</string>
+ <string name="call_home" msgid="2443904771140750492">"撥打住家電話"</string>
<string name="call_mobile" msgid="6504312789160309832">"去電行動裝置"</string>
<string name="call_work" msgid="2414313348547560346">"去電公司電話"</string>
<string name="call_fax_work" msgid="5026843006300760797">"去電公司傳真"</string>
@@ -312,7 +312,7 @@
<string name="name_suffix" msgid="4502958221763936999">"姓名後稱謂"</string>
<string name="name_phonetic" msgid="4746541275769990740">"姓名拼音"</string>
<string name="name_phonetic_given" msgid="425534279190047812">"名字拼音"</string>
- <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名 (拼音)"</string>
+ <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名拼音"</string>
<string name="name_phonetic_family" msgid="1690852801039809448">"姓氏拼音"</string>
<string name="phoneLabelsGroup" msgid="2746758650001801885">"電話"</string>
<string name="emailLabelsGroup" msgid="3360719560200449554">"電子郵件"</string>
diff --git a/src/com/android/contacts/CallUtil.java b/src/com/android/contacts/CallUtil.java
index bba1faa..0f09df9 100644
--- a/src/com/android/contacts/CallUtil.java
+++ b/src/com/android/contacts/CallUtil.java
@@ -109,7 +109,7 @@
/**
* Return an Intent for making a phone call. A given Uri will be used as is (without any
- * sanity check).
+ * quick check).
*/
public static Intent getCallIntent(Uri uri) {
return new Intent(Intent.ACTION_CALL, uri);
diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index e5f808d..1468ed7 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -602,8 +602,8 @@
private static final String[] COLUMNS = new String[] { Photo._ID, Photo.PHOTO };
/**
- * Dummy object used to indicate that a bitmap for a given key could not be stored in the
- * cache.
+ * Placeholder object used to indicate that a bitmap for a given key could not
+ * be stored in the cache.
*/
private static final BitmapHolder BITMAP_UNAVAILABLE;
diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java
index 85da891..e478b9b 100644
--- a/src/com/android/contacts/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/preference/ContactsPreferences.java
@@ -246,7 +246,7 @@
* true if the contact editor should show the "accounts changed" notification, that is:
* - If it's the first launch.
* - Or, if the default account has been removed.
- * (And some extra sanity check)
+ * (And some extra soundness check)
*
* Note if this method returns {@code false}, the caller can safely assume that
* {@link #getDefaultAccount} will return a valid account. (Either an account which still
diff --git a/src/com/android/contacts/util/StopWatch.java b/src/com/android/contacts/util/StopWatch.java
index 4300eff..1797d2a 100644
--- a/src/com/android/contacts/util/StopWatch.java
+++ b/src/com/android/contacts/util/StopWatch.java
@@ -84,7 +84,7 @@
}
/**
- * Return a dummy instance that does no operations.
+ * Return a no-op StopWatch instance that does no operations.
*/
public static StopWatch getNullStopWatch() {
return NullStopWatch.INSTANCE;
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index f61efda..f22f92c 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -40,7 +40,8 @@
<uses-library android:name="android.test.runner" />
<meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" />
- <activity android:name=".allintents.AllIntentsActivity">
+ <activity android:name=".allintents.AllIntentsActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -48,7 +49,8 @@
</intent-filter>
</activity>
- <activity android:name=".allintents.ResultActivity">
+ <activity android:name=".allintents.ResultActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 7ffecc1..06d64a8 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -197,7 +197,7 @@
}
@Test
- public void testShouldShowAccountChangedNotification_sanity_check() {
+ public void testShouldShowAccountChangedNotification_initial_check() {
// Prepare 1 account and save it as the default.
mTarget.saveDefaultAccount(ACCOUNT_1_A);