Merge "@IntDef is switching from long to int values"
diff --git a/Android.mk b/Android.mk
index 5d9826f..11cdd77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,39 +5,15 @@
phone_common_dir := ../PhoneCommon
-ifeq ($(TARGET_BUILD_APPS),)
-support_library_root_dir := frameworks/support
-else
-support_library_root_dir := prebuilts/sdk/current/support
-endif
-
src_dirs := src src-bind $(phone_common_dir)/src
res_dirs := res $(phone_common_dir)/res
asset_dirs := assets
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
- $(support_library_root_dir)/core-ui/res \
- $(support_library_root_dir)/design/res \
- $(support_library_root_dir)/transition/res \
- $(support_library_root_dir)/v7/appcompat/res \
- $(support_library_root_dir)/v7/cardview/res \
- $(support_library_root_dir)/v7/recyclerview/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages com.android.contacts.common \
- --extra-packages com.android.phone.common \
- --extra-packages android.support.coreui \
- --extra-packages android.support.design \
- --extra-packages android.support.transition \
- --extra-packages android.support.v7.appcompat \
- --extra-packages android.support.v7.cardview \
- --extra-packages android.support.v7.recyclerview
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-common \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-design \
android-support-transition \
android-support-v13 \
@@ -45,20 +21,25 @@
android-support-v7-cardview \
android-support-v7-recyclerview \
android-support-v7-palette \
- android-support-v4 \
+ android-support-v4
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-common \
com.android.vcard \
guava \
libphonenumber
+LOCAL_USE_AAPT2 := true
+
+LOCAL_AAPT_FLAGS := \
+ --auto-add-overlay \
+ --extra-packages com.android.phone.common
+
LOCAL_PACKAGE_NAME := Contacts
LOCAL_CERTIFICATE := shared
LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_FLAG_FILES := \
- proguard.flags \
- ../../../frameworks/support/core-ui/proguard-rules.pro \
- ../../../frameworks/support/design/proguard-rules.pro \
- ../../../frameworks/support/v7/recyclerview/proguard-rules.pro
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index db3a497..8bfc4a9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -486,7 +486,7 @@
<string name="setting_about" msgid="7014388749752042863">"حول جهات الاتصال"</string>
<string name="share_favorite_contacts" msgid="4280926751003081042">"مشاركة جهات الاتصال المفضلة"</string>
<string name="share_contacts" msgid="8109287987498711664">"مشاركة جميع جهات الاتصال"</string>
- <string name="share_contacts_failure" msgid="1216431977330560559">"أخفقت مشاركة جهات الاتصال."</string>
+ <string name="share_contacts_failure" msgid="1216431977330560559">"تعذّرت مشاركة جهات الاتصال."</string>
<string name="dialog_export" msgid="1628001095187741417">"تصدير جهات الاتصال"</string>
<string name="dialog_import" msgid="2423592905927819672">"استيراد جهات اتصال من"</string>
<string name="share_error" msgid="948429331673358107">"لا يمكن مشاركة جهة الاتصال هذه."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index dce2ab3..1d5176a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"সিম কার্ড থেকে পরিচিতিগুলি আমদানি করা গেল না"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"সিম আমদানি করা হচ্ছে"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"বিজ্ঞপ্তি"</string>
+ <string name="yes_button" msgid="1268479086848288060">"হ্যাঁ"</string>
+ <string name="no_button" msgid="5742815694687835125">"না"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4da5452..b6d496e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -136,13 +136,13 @@
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"Dodajte broj telefona"</string>
<string name="quickcontact_add_email" msgid="739298028384348482">"Dodajte adresu e-pošte"</string>
<string name="missing_app" msgid="1466111003546611387">"Nije pronađena aplikacija za obavljanje ove radnje."</string>
- <string name="menu_share" msgid="943789700636542260">"Podijeli"</string>
+ <string name="menu_share" msgid="943789700636542260">"Dijeli"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"Dodaj u kontakte"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"Dodaj"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">Podijeli kontakte putem</item>
- <item quantity="few">Podijeli kontakte putem</item>
- <item quantity="other">Podijeli kontakte putem</item>
+ <item quantity="one">Dijeli kontakte putem</item>
+ <item quantity="few">Dijeli kontakte putem</item>
+ <item quantity="other">Dijeli kontakte putem</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"Odaberi račun"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Izrada oznake"</string>
@@ -419,7 +419,7 @@
<string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nije moguće otvoriti \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nije moguće pokrenuti program za izvoz: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nema sadržaja za izvoz."</string>
- <string name="missing_required_permission" msgid="5865884842972833120">"Onemogućili ste potrebnu dozvolu."</string>
+ <string name="missing_required_permission" msgid="5865884842972833120">"Onemogućili ste potrebno odobrenje."</string>
<string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Došlo je do greške prilikom izvoza: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"I/O greška"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Nema dovoljno memorije. Možda je fajl prevelik."</string>
@@ -497,7 +497,7 @@
<string name="about_open_source_licenses" msgid="6479990452352919641">"Licence otvorenog koda"</string>
<string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detalji o licenci za softver otvorenog koda"</string>
<string name="about_privacy_policy" msgid="3705518622499152626">"Pravila privatnosti"</string>
- <string name="about_terms_of_service" msgid="4642400812150296723">"Uslovi pružanja usluge"</string>
+ <string name="about_terms_of_service" msgid="4642400812150296723">"Uslovi korištenja usluge"</string>
<string name="activity_title_licenses" msgid="5467767062737708066">"Licence otvorenog koda"</string>
<string name="url_open_error_toast" msgid="452592089815420457">"Otvaranje URL-a nije uspjelo."</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> je označen"</string>
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nije moguće uvesti kontakte sa SIM kartice"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz sa SIM kartice"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavještenja"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 631b240..d565061 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c03263a..302e97c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No se han podido importar los contactos de la tarjeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se está importando la tarjeta SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a600987..00b7ae8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer des contacts à partir de la carte SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation des contacts SIM en cours…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Avis"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Oui"</string>
+ <string name="no_button" msgid="5742815694687835125">"Non"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 26a6250..e94cbad 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM કાર્ડમાંથી સંપર્કો આયાત કરી શક્યાં નથી"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM આયાત કરી રહ્યાં છે"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"સૂચનાઓ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"હા"</string>
+ <string name="no_button" msgid="5742815694687835125">"ના"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cfc8607..6bfcb61 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,7 +52,7 @@
<string name="joinConfirmation" msgid="8262614843581924365">"Ingin menyimpan perubahan yang sudah dilakukan dan menautkan dengan kontak yang dipilih?"</string>
<string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Simpan dan Tautkan"</string>
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Menautkan"</string>
- <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan tautan"</string>
+ <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan link"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Tautkan"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"Lihat kontak yang ditautkan"</string>
<string name="menu_save" msgid="1727844363591825909">"Simpan"</string>
@@ -250,7 +250,7 @@
<string name="navigation_drawer_label" msgid="4154758025620107419">"Label <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Label"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Akun"</string>
- <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat riwayat bersama"</string>
+ <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat histori bersama"</string>
<string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Acara dan pesan"</string>
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Acara"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Pesan"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimpor kontak dari kartu SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimpor SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifikasi"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ya"</string>
+ <string name="no_button" msgid="5742815694687835125">"Tidak"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 206a001..7a5fae2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"הייבוא מכרטיס ה-SIM מתבצע"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"הודעות"</string>
+ <string name="yes_button" msgid="1268479086848288060">"כן"</string>
+ <string name="no_button" msgid="5742815694687835125">"לא"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index cf9fd75..c751904 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ბარათიდან კონტაქტების იმპორტი ვერ შესრულდა"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"მიმდინარეობს SIM-ის იმპორტი"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"შეტყობინებები"</string>
+ <string name="yes_button" msgid="1268479086848288060">"დიახ"</string>
+ <string name="no_button" msgid="5742815694687835125">"არა"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 903105e..a96eb44 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ಸಿಮ್ ಕಾರ್ಡ್ನಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ಸಿಮ್ ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ಅಧಿಸೂಚನೆಗಳು"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ಹೌದು"</string>
+ <string name="no_button" msgid="5742815694687835125">"ಇಲ್ಲ"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index fc724ef..6540a72 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"സിം കാർഡിൽ നിന്ന് കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"അറിയിപ്പുകൾ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"അതെ"</string>
+ <string name="no_button" msgid="5742815694687835125">"ഇല്ല"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 266ffd9..2c1a965 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM картнаас харилцагчдыг импортолж чадсангүй"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-г импорт хийж байна"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Мэдэгдэл"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Тийм"</string>
+ <string name="no_button" msgid="5742815694687835125">"Үгүй"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4afc2cf..12f9fc7 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"सिम कार्ड वरून संपर्क आयात करणेे शक्य झाले नाही"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करत आहे"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचना"</string>
+ <string name="yes_button" msgid="1268479086848288060">"होय"</string>
+ <string name="no_button" msgid="5742815694687835125">"नाही"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0dd7ed8..f592142 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्डबाट सम्पर्कहरू आयात गर्न सकिएन"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM आयात गरिँदै"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचनाहरू"</string>
+ <string name="yes_button" msgid="1268479086848288060">"हुन्छ"</string>
+ <string name="no_button" msgid="5742815694687835125">"हुँदैन"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 25a381e..9e90fc8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ਕਾਰਡ ਤੋਂ ਸੰਪਰਕ ਆਯਾਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ਸਿਮ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ਸੂਚਨਾਵਾਂ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ਹਾਂ"</string>
+ <string name="no_button" msgid="5742815694687835125">"ਨਹੀਂ"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f60f241..9ff358b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -66,16 +66,16 @@
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Contactos <xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminados"</string>
<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… foram eliminados"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
- <item quantity="one">Contacto eliminado</item>
<item quantity="other">Contactos eliminados</item>
+ <item quantity="one">Contacto eliminado</item>
</plurals>
<plurals name="contacts_count" formatted="false" msgid="8696793457340503668">
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contactos</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Da Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -137,8 +137,8 @@
<string name="menu_add_contact" msgid="3198704337220892684">"Adicionar aos contactos"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"Adicionar"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">Partilhar contacto através de</item>
<item quantity="other">Partilhar contactos através de</item>
+ <item quantity="one">Partilhar contacto através de</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"Selecionar conta"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Criar etiqueta"</string>
@@ -396,12 +396,12 @@
<string name="import_from_sim" msgid="6912071635295799131">"Cartão SIM"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
- <item quantity="one">1 contacto</item>
<item quantity="other">%1$d contactos</item>
+ <item quantity="one">1 contacto</item>
</plurals>
<plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
- <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contactos • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
</plurals>
<string name="import_from_vcf_file" msgid="8662528435646418203">"Ficheiro .vcf"</string>
<string name="nothing_to_import_message" msgid="1651921906873335656">"Nada para importar"</string>
@@ -509,8 +509,8 @@
<string name="sim_import_empty_message" msgid="7743815244380189651">"Sem contactos no cartão SIM"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"O contacto já existe na sua lista"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
- <item quantity="one">1 contacto do cartão SIM importado</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactos do cartão SIM importados</item>
+ <item quantity="one">1 contacto do cartão SIM importado</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
<string name="sim_import_title" msgid="2511154832820812822">"Importar do cartão SIM"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar contactos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+ <string name="no_button" msgid="5742815694687835125">"Não"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2a2abe9..3424d08 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -421,7 +421,7 @@
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>"</string>
<string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"Anwani zimehamishwa."</string>
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"Anwani zimehamishwa; bofya arifa ili ushiriki anwani."</string>
- <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gonga ili ushiriki anwani."</string>
+ <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gusa ili ushiriki anwani."</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Inahamisha data ya anwani"</string>
<string name="exporting_contact_list_message" msgid="3367949209642931952">"Data ya anwani inahamishwa."</string>
@@ -515,9 +515,9 @@
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Imeshindwa kuleta anwani zilizo kwenye SIM kadi"</string>
<string name="sim_import_title" msgid="2511154832820812822">"Leta kutoka kwenye SIM kadi"</string>
<string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Ghairi"</string>
- <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gonga ili uuwashe."</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gusa ili uuwashe."</string>
<string name="dismiss_sync_alert" msgid="8941131776605093596">"Ondoa"</string>
- <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gonga ili uuwashe."</string>
+ <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gusa ili uuwashe."</string>
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Je, unataka kuwasha usawazishaji wa kiotomatiki?"</string>
<string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Mabadiliko utakayofanya katika programu na akaunti zote, wala si katika Anwani tu, yatasawazishwa kwenye wavuti na kwenye vifaa vyako."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Washa"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 327fb29..02ee273 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM కార్డ్ నుండి పరిచయాలను దిగుమతి చేయలేకపోయింది"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIMను దిగుమతి చేస్తోంది"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"నోటిఫికేషన్లు"</string>
+ <string name="yes_button" msgid="1268479086848288060">"అవును"</string>
+ <string name="no_button" msgid="5742815694687835125">"కాదు"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f3b5b41..b92c73c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM کارڈ سے رابطے درآمد نہیں ہو سکے"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM درآمد ہو رہی ہے"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"اطلاعات"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ہاں"</string>
+ <string name="no_button" msgid="5742815694687835125">"نہیں"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ea9708..d461455 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1586,4 +1586,10 @@
<!-- Text shown when viewing channel settings for default Contacts notifications [CHAR LIMIT=50] -->
<string name="contacts_default_notification_channel">Notifications</string>
+ <!-- Text of Positive Button in dialog -->
+ <string name="yes_button">Yes</string>
+
+ <!-- Text of Negative Button in dialog -->
+ <string name="no_button">No</string>
+
</resources>
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 92087b3..9b0c896 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -171,7 +171,8 @@
if (account.dataSet != null) {
groupsUri.appendQueryParameter(Groups.DATA_SET, account.dataSet).build();
}
- final Cursor cursor = resolver.query(groupsUri.build(), null, null, null, null);
+ final Cursor cursor = resolver.query(groupsUri.build(), null,
+ Groups.DELETED + "=0", null, null);
if (cursor == null) {
continue;
}
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index 5787d62..a6b58cc 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -91,9 +91,9 @@
}
final AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setMessage(message)
- .setPositiveButton(android.R.string.ok, new RequestCancelListener())
+ .setPositiveButton(R.string.yes_button, new RequestCancelListener())
.setOnCancelListener(mCancelListener)
- .setNegativeButton(android.R.string.cancel, mCancelListener);
+ .setNegativeButton(R.string.no_button, mCancelListener);
return builder.create();
} else if (id == R.id.dialog_cancel_failed) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this)