Merge "Don't show spam indicator if incoming call number is in local contacts."
diff --git a/InCallUI/res/values-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 96f0466..1763a26 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Отхвърляне"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Обр. обажд."</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Съобщение"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"Текущо обаждане на друго устройство"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Прехвърляне на обаждането"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"За да осъществите обаждане, първо изключете самолетния режим."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Няма регистрация в мрежата."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"Няма достъп до клетъчната мрежа."</string>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index 0c1ebfb..eeaa483 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Rechazar"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Llamar"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Mensaje"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"Llamada activa en otro dispositivo"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Transferir llamada"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"No estás registrado en la red."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"La red móvil no está disponible."</string>
diff --git a/InCallUI/res/values-eu-rES/strings.xml b/InCallUI/res/values-eu-rES/strings.xml
index 764fb97..05061aa 100644
--- a/InCallUI/res/values-eu-rES/strings.xml
+++ b/InCallUI/res/values-eu-rES/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Baztertu"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Itzuli deia"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Bidali SMSa"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"Dei bat abian da beste gailu batean"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Transferitu deia"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Deitzeko, desaktibatu hegaldi modua."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Ez dago sarean erregistratuta."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"Sare mugikorra ez dago erabilgarri."</string>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index c3dd225..c8cf3941 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -84,7 +84,7 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Tutup"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Telepon balik"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Pesan"</string>
- <string name="notification_external_call" msgid="5611236780302924816">"Panggilan yang berlangsung pada perangkat lain"</string>
+ <string name="notification_external_call" msgid="5611236780302924816">"Panggilan yang berlangsung di perangkat lain"</string>
<string name="notification_transfer_call" msgid="687009078741947505">"Transfer Panggilan"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Untuk melakukan panggilan, terlebih dahulu nonaktifkan mode Pesawat."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Tidak terdaftar pada jaringan."</string>
diff --git a/InCallUI/res/values-ka-rGE/strings.xml b/InCallUI/res/values-ka-rGE/strings.xml
index 0c96b95..3a69a3b 100644
--- a/InCallUI/res/values-ka-rGE/strings.xml
+++ b/InCallUI/res/values-ka-rGE/strings.xml
@@ -68,7 +68,7 @@
<string name="notification_incoming_call_wifi" msgid="8337740714221114955">"შემომავალი Wi-Fi ზარი"</string>
<string name="notification_incoming_work_call_wifi" msgid="3248418394186803763">"შემომავალი Wi-Fi ზარი (სამსახური)"</string>
<string name="notification_incoming_video_call" msgid="7814873581838165772">"შემომავალი ვიდეო ზარი"</string>
- <string name="notification_incoming_spam_call" msgid="4671356711842697266">"სავარაუდოდ სპამური შემომავალი ზარი"</string>
+ <string name="notification_incoming_spam_call" msgid="4671356711842697266">"შემომავალი ზარი - სავარაუდოდ სპამი"</string>
<string name="notification_requesting_video_call" msgid="4844596091477863245">"შემომავალი ვიდეოს მოთხოვნა"</string>
<string name="notification_voicemail_title" msgid="7595628197933709144">"ახალი ხმოვანი შეტყობინება"</string>
<string name="notification_voicemail_title_count" msgid="1241573926817248239">"ახალი ხმოვანი შეტყობინება (<xliff:g id="COUNT">%d</xliff:g>)"</string>
diff --git a/InCallUI/res/values-ky-rKG/strings.xml b/InCallUI/res/values-ky-rKG/strings.xml
index fedd011..c5d2c4d 100644
--- a/InCallUI/res/values-ky-rKG/strings.xml
+++ b/InCallUI/res/values-ky-rKG/strings.xml
@@ -84,8 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Этибарга албоо"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Кайра чалуу"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Билдирүү"</string>
- <string name="notification_external_call" msgid="5611236780302924816">"Башка түзмөктөгү учурдагы чалуу"</string>
- <string name="notification_transfer_call" msgid="687009078741947505">"Чалууну өткөрүү"</string>
+ <string name="notification_external_call" msgid="5611236780302924816">"Башка түзмөктө сүйлөшүп жатасыз"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Чалууну бул түзмөккө өткөрүү"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Учак режимин өчүрүп туруп чалыңыз."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Тармакта катталган эмес."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"Мобилдик тармак жеткиликтүү эмес."</string>
diff --git a/InCallUI/res/values-nb/strings.xml b/InCallUI/res/values-nb/strings.xml
index 965d436..939236a 100644
--- a/InCallUI/res/values-nb/strings.xml
+++ b/InCallUI/res/values-nb/strings.xml
@@ -84,7 +84,7 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Avvis"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Ring tilbake"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Melding"</string>
- <string name="notification_external_call" msgid="5611236780302924816">"Pågående samtale på en annen enhet"</string>
+ <string name="notification_external_call" msgid="5611236780302924816">"Samtale pågår på en annen enhet"</string>
<string name="notification_transfer_call" msgid="687009078741947505">"Overfør samtalen"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"For å ringe, slå av flymodus først."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Ikke registrert på nettverket."</string>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index 4c273d7..b102204 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"Ondoa"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Mpigie"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Ujumbe"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"Una Hangout inayoendelea kwenye kifaa kingine"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Hamisha Hangout"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Ili upige simu kwanza, zima Hali ya ndegeni."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Haijasajiliwa kwenye mtandao."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"Mitandao ya simu za mkononi haipatikani."</string>
diff --git a/InCallUI/res/values-th/strings.xml b/InCallUI/res/values-th/strings.xml
index 727fb47..3155262 100644
--- a/InCallUI/res/values-th/strings.xml
+++ b/InCallUI/res/values-th/strings.xml
@@ -84,7 +84,7 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"ปิด"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"โทรกลับ"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"ข้อความ"</string>
- <string name="notification_external_call" msgid="5611236780302924816">"โทรต่อเนื่องบนอุปกรณ์อื่น"</string>
+ <string name="notification_external_call" msgid="5611236780302924816">"กำลังใช้สายบนอุปกรณ์อื่น"</string>
<string name="notification_transfer_call" msgid="687009078741947505">"โอนสาย"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"หากต้องการโทรออก ให้ปิดโหมดบนเครื่องบินก่อน"</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 54dbe11..e60155e 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"I-dismiss"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"Tawagan"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"Mensahe"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"Kasalukuyang tawag sa isa pang device"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"Ilipat ang Tawag"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"Upang tumawag, paki-off muna ang Airplane mode."</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"Hindi nakarehistro sa network."</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"Hindi available ang cellular network."</string>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index 3896509..4189990 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"برخاست کریں"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"واپس کال کریں"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"پیغام"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"ایک اور آلے پر جاری کال"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"کال منتقل کریں"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"کال کرنے کیلئے، پہلے ہوائی جہاز طرز کو آف کریں۔"</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"نیٹ ورک پر رجسٹرڈ نہیں ہے۔"</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"سیلولر نیٹ ورک دستیاب نہیں ہے۔"</string>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 6a797bb..122bb3d 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -84,10 +84,8 @@
<string name="notification_action_dismiss" msgid="1998811618480434300">"拒絕"</string>
<string name="notification_missedCall_call_back" msgid="7855043480614703539">"回撥"</string>
<string name="notification_missedCall_message" msgid="2407410183079324393">"傳送簡訊"</string>
- <!-- no translation found for notification_external_call (5611236780302924816) -->
- <skip />
- <!-- no translation found for notification_transfer_call (687009078741947505) -->
- <skip />
+ <string name="notification_external_call" msgid="5611236780302924816">"其他裝置上有進行中的通話"</string>
+ <string name="notification_transfer_call" msgid="687009078741947505">"轉接來電"</string>
<string name="incall_error_power_off" msgid="3626117639377110403">"撥號前，請先關閉飛航模式。"</string>
<string name="incall_error_emergency_only" msgid="8704761887752183855">"尚未註冊網路。"</string>
<string name="incall_error_out_of_service" msgid="1830319376612608339">"無法連線到行動網路。"</string>
diff --git a/res/layout/block_report_spam_dialog.xml b/res/layout/block_report_spam_dialog.xml
new file mode 100644
index 0000000..a731dec
--- /dev/null
+++ b/res/layout/block_report_spam_dialog.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="25dp">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/block_report_number_alert_details"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/call_log_primary_color"
+ android:textSize="@dimen/blocked_number_settings_description_text_size"/>
+
+ <CheckBox
+ android:id="@+id/report_number_as_spam_action"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/checkbox_report_as_spam_action"
+ android:textSize="@dimen/blocked_number_settings_description_text_size"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 799b60a..73e7e41 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -269,14 +269,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacija Telefon nema dozvolu za upisivanje u sistemska podešavanja."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blokiran"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> je aktivan"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Blokiraj/prijavi kao nepoželjan"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Blokiraj"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Nije nepoželjan"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Deblokiraj"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Nepoželjan"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b7e5411..d1f3661 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Opkaldsappen har ikke tilladelse til at ændre systemindstillinger."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blokeret"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> er aktivt"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Bloker/rapportér spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Bloker"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Ikke spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Ophæv blokering"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b3d6fe9..3ef7296 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Die App \"Telefon\" ist nicht berechtigt, die Systemeinstellungen zu überschreiben."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blockiert"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ist aktiv"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Blockieren/Spam melden"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Blockieren"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Kein Spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Blockierung aufheben"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d9f27e6..fdc58bf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Η εφαρμογή \"Τηλέφωνο\" δεν έχει άδεια εγγραφής στις ρυθμίσεις συστήματος."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Αποκλεισμένος"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"Ο χρήστης <xliff:g id="NAMEORNUMBER">^1</xliff:g> είναι ενεργός"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Αποκλεισμός/αναφορά ανεπιθύμ."</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Αποκλεισμός"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Μη ανεπιθύμητος"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Κατάργηση αποκλεισμού"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Ανεπιθύμητα"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 4e7aff0..01ce4eb 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blocked"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> is active"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Block/report spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Block"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Not spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Unblock"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4e7aff0..01ce4eb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blocked"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> is active"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Block/report spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Block"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Not spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Unblock"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4e7aff0..01ce4eb 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Blocked"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> is active"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Block/report spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Block"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Not spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Unblock"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f24e551..944de16 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Bloqué"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"Appel en cours avec : <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Bloquer/signaler comme pourriel"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Bloquer"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"N\'est pas un pourriel"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Débloquer"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Pourriel"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 2f8a907..3f159da 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ફોન એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ પર લખવાની પરવાનગી નથી."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"અવરોધિત"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> સક્રિય છે"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"સ્પામની જાણ કરો/અવરોધિત કરો"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"અવરોધિત કરો"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"સ્પામ નથી"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"અનાવરોધિત કરો"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"સ્પામ"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0b86eb5..ec1da7b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"फ़ोन ऐप को सिस्टम सेटिंग में लिखने की अनुमति नहीं है."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"अवरोधित"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> सक्रिय है"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"अवरुद्ध करें/स्पैम की रिपोर्ट करें"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"अवरुद्ध करें"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"स्पैम नहीं है"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"अनवरोधित करें"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"स्पैम"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 9659d00..90c9e09 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Հեռախոս հավելվածը համակարգի կարգավորումները գրելու թույլտվություն չունի:"</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Արգելափակված"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ն ակտիվ է"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Արգելափակել/Նշել որպես լցոն"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Արգելափակել"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Լցոն չէ"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Արգելաբացել"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Լցոն"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3eea58d..cc47192 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikasi telepon tidak memiliki izin untuk menulis ke setelan sistem."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Diblokir"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> aktif"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Blokir/laporkan spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Blokir"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Bukan spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Bebaskan"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 29da507..1d25a56 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -271,14 +271,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"לאפליקציית הטלפון אין הרשאה לכתוב בהגדרות המערכת."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"חסום"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> זמין/ה"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"חסום/דווח על ספאם"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"חסום"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"לא ספאם"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"בטל חסימה"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"ספאם"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index fde01ae..484cb9b 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Телефон қолданбасында жүйелік параметрлерге жазуға рұқсат жоқ."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Бөгелген"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> белсенді"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Спамды бөгеу/туралы есеп беру"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Бөгеу"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Спам емес"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Бөгеуді алу"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Спам"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index a49c94e..401f6b4 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -291,14 +291,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Телефон колдонмосунун Тутум жөндөөлөрүнө жазууга уруксаты жок."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Бөгөттөлгөн"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> жүрүп жатат"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Бөгөттөө/спам катары кабарлоо"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Бөгөттөө"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Спам эмес"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Бөгөттөн чыгаруу"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Спам"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 0d648fb..cfd66bb 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ແອັບໂທລະສັບບໍ່ມີການອະນຸຍາດໃຫ້ຂຽນໃສ່ການຕັ້ງຄ່າລະບົບ."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"ບລັອກໄວ້ແລ້ວ"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"ຢູ່ໃນສາຍ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ຢູ່"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"ບລັອກ/ລາຍງານສະແປມ"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"ບລັອກ"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"ບໍ່ແມ່ນສະແປມ"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"ຍົກເລີກການບລັອກ"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"ສະແປມ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 81f900e..f997a0f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -271,14 +271,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefono programa neturi leidimo keisti sistemos nustatymų."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Užblokuota"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> aktyvus"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Blokuoti / pran. apie šlamštą"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Blokuoti"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Ne šlamštas"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Panaikinti blokavimą"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Šlamštas"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 32d6035..038230d 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"സിസ്റ്റം ക്രമീകരണത്തിലേക്ക് എഴുതാൻ ഫോൺ ആപ്പിന് അനുമതിയില്ല."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"ബ്ലോക്കുചെയ്തു"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> സജീവമാണ്"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"ബ്ലോക്കുചെയ്യുക/സ്പാമാണെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"ബ്ലോക്കുചെയ്യുക"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"സ്പാം അല്ല"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"അൺബ്ലോക്കുചെയ്യുക"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"സ്പാം"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 15647d9..d4f5a51 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"A aplicação Telefone não tem autorização para gravar nas definições do sistema."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Bloqueado"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> está ativa"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Bloquear/denunciar spam"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Bloquear"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Não é spam"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Desbloquear"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Spam"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 114d3e8..a272b68 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -271,14 +271,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"У приложения \"Телефон\" нет разрешения на изменение системных настроек."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Заблокирован"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: вызов активен"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Заблокировать/сообщить о спаме"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Заблокировать"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Не спам"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Разблокировать"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Спам"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index a4dacfa..f464d8c 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacionet e telefonit nuk kanë leje të shkruajnë në cilësimet e sistemit."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"I bllokuar"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> është aktive"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Blloko/raporto të padëshiruar"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Blloko"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Nuk është i padëshiruar"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Zhblloko"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"E bezdisshme"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 431837d..293718c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -269,14 +269,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Апликација Телефон нема дозволу за уписивање у системска подешавања."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Блокиран"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> је активан"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Блокирај/пријави као непожељан"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Блокирај"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Није непожељан"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Деблокирај"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Непожељан"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 1bf990c..559058d 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"సిస్టమ్ సెట్టింగ్లకు వ్రాయడం కోసం ఫోన్ అనువర్తనానికి అనుమతి లేదు."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"బ్లాక్ అయ్యారు"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> కాల్ సక్రియంగా ఉంది"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"బ్లాక్ చేయి/స్పామ్గానివేదించు"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"బ్లాక్ చేయి"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"స్పామ్ కాదు"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"అన్బ్లాక్ చేయి"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"స్పామ్"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b579446..9caccb8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -267,14 +267,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"แอปโทรศัพท์ไม่ได้รับอนุญาตให้เขียนไปยังการตั้งค่าระบบ"</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"ถูกบล็อก"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ต่อสายอยู่"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"บล็อก/รายงานจดหมายขยะ"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"บล็อก"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"ไม่ใช่จดหมายขยะ"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"เลิกบล็อก"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"สแปม"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8804519..47117cd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -271,14 +271,9 @@
<string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Додаток Телефон не має дозволу змінювати системні налаштування."</string>
<string name="blocked_number_call_log_label" msgid="8912042441473014712">"Заблоковано"</string>
<string name="accessibility_call_is_active" msgid="2297282583928508760">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: дзвінок активний"</string>
- <!-- no translation found for call_log_action_block_report_number (8288915197641750257) -->
- <skip />
- <!-- no translation found for call_log_action_block_number (5920731882931944594) -->
- <skip />
- <!-- no translation found for call_log_action_remove_spam (5750557938714304455) -->
- <skip />
- <!-- no translation found for call_log_action_unblock_number (8906582251480361069) -->
- <skip />
- <!-- no translation found for spam_number_call_log_label (5601566820155823850) -->
- <skip />
+ <string name="call_log_action_block_report_number" msgid="8288915197641750257">"Заблокувати/позначити як спам"</string>
+ <string name="call_log_action_block_number" msgid="5920731882931944594">"Заблокувати"</string>
+ <string name="call_log_action_remove_spam" msgid="5750557938714304455">"Не спам"</string>
+ <string name="call_log_action_unblock_number" msgid="8906582251480361069">"Розблокувати"</string>
+ <string name="spam_number_call_log_label" msgid="5601566820155823850">"Спам"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fca528..2907615 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1066,4 +1066,31 @@
<!-- Label under the name of a spam number in the call log. [CHAR LIMIT=15] -->
<string name="spam_number_call_log_label">Spam</string>
+
+ <!-- Title of alert dialog after clicking on Block/report as spam. [CHAR LIMIT=100] -->
+ <string name="block_report_number_alert_title">Block <xliff:g id="number">%1$s</xliff:g>?</string>
+
+ <!-- Text in alert dialog after clicking on Block/report as spam. [CHAR LIMIT=100] -->
+ <string name="block_report_number_alert_details">Future calls and voicemails from this number will be blocked.</string>
+
+ <!-- Label for checkbox in the Alert dialog to allow the user to report the number as spam as well. [CHAR LIMIT=30] -->
+ <string name="checkbox_report_as_spam_action">Report call as spam</string>
+
+ <!-- Text in alert dialog after clicking on Block. [CHAR LIMIT=100] -->
+ <string name="block_number_alert_details">Future calls and voicemails from this number will be blocked. This call will be reported as spam.</string>
+
+ <!-- Title of alert dialog after clicking on Unblock. [CHAR LIMIT=100] -->
+ <string name="unblock_report_number_alert_title">Unblock <xliff:g id="number">%1$s</xliff:g>?</string>
+
+ <!-- Text in alert dialog after clicking on Unblock. [CHAR LIMIT=100] -->
+ <string name="unblock_number_alert_details">This number will be unblocked and reported as not spam. Future calls and voicemails won\'t be identified as spam.</string>
+
+ <!-- Title of alert dialog after clicking on Report as not spam. [CHAR LIMIT=100] -->
+ <string name="report_not_spam_alert_title">Whitelist <xliff:g id="number">%1$s</xliff:g>?</string>
+
+ <!-- Report not spam number alert dialog button [CHAR LIMIT=32] -->
+ <string name="report_not_spam_alert_button">Whitelist</string>
+
+ <!-- Text in alert dialog after clicking on Report as not spam. [CHAR LIMIT=100] -->
+ <string name="report_not_spam_alert_details">Future calls and voicemails from this number won\'t be identified as spam. This number will be reported as not spam.</string>
</resources>
diff --git a/src/com/android/dialer/calllog/BlockReportSpamListener.java b/src/com/android/dialer/calllog/BlockReportSpamListener.java
new file mode 100644
index 0000000..bda4ee5
--- /dev/null
+++ b/src/com/android/dialer/calllog/BlockReportSpamListener.java
@@ -0,0 +1,158 @@
+package com.android.dialer.calllog;
+
+import android.app.AlertDialog;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.CheckBox;
+
+import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.service.ExtendedCallInfoService;
+import com.android.dialer.R;
+
+/**
+ * Listener to show dialogs for block and report spam actions.
+ */
+public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClickListener {
+
+ private final Context mContext;
+ private final RecyclerView.Adapter mAdapter;
+ private final ExtendedCallInfoService mExtendedCallInfoService;
+ private final FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler;
+
+ public BlockReportSpamListener(Context context, RecyclerView.Adapter adapter,
+ ExtendedCallInfoService extendedCallInfoService,
+ FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) {
+ mContext = context;
+ mAdapter = adapter;
+ mExtendedCallInfoService = extendedCallInfoService;
+ mFilteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler;
+ }
+
+ @Override
+ public void onBlockReportSpam(String displayNumber, final String number,
+ final String countryIso, final int callType) {
+ final View dialogView = View.inflate(mContext, R.layout.block_report_spam_dialog, null);
+
+ AlertDialog.Builder alertDialogBuilder = createDialogBuilder();
+ alertDialogBuilder
+ .setView(dialogView)
+ .setTitle(mContext.getString(
+ R.string.block_report_number_alert_title, displayNumber))
+ .setPositiveButton(mContext.getString(R.string.block_number_ok),
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ CheckBox isSpamCheckbox = (CheckBox) dialogView
+ .findViewById(R.id.report_number_as_spam_action);
+ if (isSpamCheckbox.isChecked()) {
+ mExtendedCallInfoService.reportSpam(
+ number, countryIso, callType);
+ }
+ mFilteredNumberAsyncQueryHandler.blockNumber(
+ new FilteredNumberAsyncQueryHandler.OnBlockNumberListener() {
+ @Override
+ public void onBlockComplete(Uri uri) {
+ mAdapter.notifyDataSetChanged();
+ }
+ },
+ number,
+ countryIso);
+ }
+ });
+ alertDialogBuilder.show();
+ }
+
+ @Override
+ public void onBlock(String displayNumber, final String number, final String countryIso,
+ final int callType) {
+ AlertDialog.Builder alertDialogBuilder = createDialogBuilder();
+ alertDialogBuilder
+ .setTitle(mContext.getString(
+ R.string.block_report_number_alert_title, displayNumber))
+ .setMessage(R.string.block_number_alert_details)
+ .setPositiveButton(mContext.getString(R.string.block_number_ok),
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ mExtendedCallInfoService.reportSpam(number, countryIso, callType);
+ mFilteredNumberAsyncQueryHandler.blockNumber(
+ new FilteredNumberAsyncQueryHandler.OnBlockNumberListener() {
+ @Override
+ public void onBlockComplete(Uri uri) {
+ mAdapter.notifyDataSetChanged();
+ }
+ },
+ number,
+ countryIso);
+ }
+ });
+ alertDialogBuilder.show();
+ }
+
+ @Override
+ public void onUnblock(String displayNumber, final String number, final String countryIso,
+ final Integer blockId, final boolean isSpam, final int callType) {
+ AlertDialog.Builder alertDialogBuilder = createDialogBuilder();
+ if (isSpam) {
+ alertDialogBuilder.setMessage(R.string.unblock_number_alert_details);
+ }
+ alertDialogBuilder
+ .setTitle(mContext.getString(
+ R.string.unblock_report_number_alert_title, displayNumber))
+ .setPositiveButton(R.string.unblock_number_ok,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (isSpam) {
+ mExtendedCallInfoService.reportNotSpam(
+ number, countryIso, callType);
+ }
+ mFilteredNumberAsyncQueryHandler.unblock(
+ new FilteredNumberAsyncQueryHandler.OnUnblockNumberListener() {
+ @Override
+ public void onUnblockComplete(int rows, ContentValues values) {
+ mAdapter.notifyDataSetChanged();
+ }
+ },
+ blockId);
+ }
+ });
+ alertDialogBuilder.show();
+ }
+
+ @Override
+ public void onReportNotSpam(String displayNumber, final String number, final String countryIso,
+ final int callType) {
+ AlertDialog.Builder alertDialogBuilder = createDialogBuilder();
+ alertDialogBuilder
+ .setTitle(mContext.getString(
+ R.string.report_not_spam_alert_title, displayNumber))
+ .setMessage(R.string.report_not_spam_alert_details)
+ .setPositiveButton(R.string.report_not_spam_alert_button,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ mExtendedCallInfoService.reportNotSpam(
+ number, countryIso, callType);
+ mAdapter.notifyDataSetChanged();
+ }
+ });
+ alertDialogBuilder.show();
+ }
+
+ private AlertDialog.Builder createDialogBuilder() {
+ return new AlertDialog.Builder(mContext)
+ .setCancelable(true)
+ .setNegativeButton(mContext.getString(android.R.string.cancel),
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.cancel();
+ }
+ });
+ }
+}
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index e826867..506dafd 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -16,14 +16,15 @@
package com.android.dialer.calllog;
-import com.android.dialer.compat.FilteredNumberCompat;
import com.android.dialer.filterednumber.BlockNumberDialogFragment;
import com.android.dialer.service.ExtendedCallInfoService;
import com.android.dialerbind.ObjectFactory;
import com.google.common.annotations.VisibleForTesting;
-import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ContentValues;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
@@ -44,6 +45,7 @@
import android.view.View.AccessibilityDelegate;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
+import android.widget.CheckBox;
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.compat.CompatUtils;
@@ -70,8 +72,7 @@
*/
public class CallLogAdapter extends GroupingListAdapter
implements CallLogGroupBuilder.GroupCreator,
- VoicemailPlaybackPresenter.OnVoicemailDeletedListener,
- CallLogListItemViewHolder.OnClickListener {
+ VoicemailPlaybackPresenter.OnVoicemailDeletedListener {
// Types of activities the call log adapter is used for
public static final int ACTIVITY_TYPE_CALL_LOG = 1;
@@ -140,6 +141,7 @@
public void onChangeFilteredNumberUndo() {
}
};
+ private CallLogListItemViewHolder.OnClickListener mBlockReportSpamListener;
/**
* Hashmap, keyed by call Id, used to track the day group for a call. As call log entries are
@@ -319,6 +321,8 @@
maybeShowVoicemailPromoCard();
mExtendedCallInfoService = ObjectFactory.newExtendedCallInfoService(context);
+ mBlockReportSpamListener = new BlockReportSpamListener(mContext, this,
+ mExtendedCallInfoService, mFilteredNumberAsyncQueryHandler);
setHasStableIds(true);
}
@@ -336,36 +340,6 @@
}
}
- @Override
- public void onBlockReportSpam(String number, String countryIso, String displayNumber) {
- mExtendedCallInfoService.reportSpam(number, countryIso);
- notifyDataSetChanged();
- }
-
- @Override
- public void onBlock(String number, String countryIso, String displayNumber) {
- FilteredNumberCompat
- .showBlockNumberDialogFlow(mContext.getContentResolver(), null, number,
- countryIso, displayNumber, R.id.floating_action_button_container,
- ((Activity) mContext).getFragmentManager(),
- mBlockedNumberDialogCallback);
- }
-
- @Override
- public void onUnblock(String number, String countryIso, Integer blockId, String displayNumber) {
- FilteredNumberCompat
- .showBlockNumberDialogFlow(mContext.getContentResolver(), blockId, number,
- countryIso, displayNumber, R.id.floating_action_button_container,
- ((Activity) mContext).getFragmentManager(),
- mBlockedNumberDialogCallback);
- }
-
- @Override
- public void onReportNotSpam(String number, String countryIso, String displayNumber) {
- mExtendedCallInfoService.reportNotSpam(number, countryIso);
- notifyDataSetChanged();
- }
-
/**
* Requery on background thread when {@link Cursor} changes.
*/
@@ -442,7 +416,7 @@
CallLogListItemViewHolder viewHolder = CallLogListItemViewHolder.create(
view,
mContext,
- this,
+ mBlockReportSpamListener,
mExpandCollapseListener,
mCallLogCache,
mCallLogListItemHelper,
diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 53e6fbb..aaa9dc8 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -54,6 +54,7 @@
import com.android.dialer.compat.FilteredNumberCompat;
import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
import com.android.dialer.filterednumber.BlockNumberDialogFragment;
+import com.android.dialer.filterednumber.BlockedNumbersMigrator;
import com.android.dialer.filterednumber.FilteredNumbersUtil;
import com.android.dialer.logging.Logger;
import com.android.dialer.logging.ScreenEvent;
@@ -73,10 +74,12 @@
View.OnCreateContextMenuListener {
public interface OnClickListener {
- void onBlockReportSpam(String number, String countryIso, String displayNumber);
- void onBlock(String number, String countryIso, String displayNumber);
- void onUnblock(String number, String countryIso, Integer blockId, String displayNumber);
- void onReportNotSpam(String number, String countryIso, String displayNumber);
+ void onBlockReportSpam(
+ String displayNumber, String number, String countryIso, int callType);
+ void onBlock(String displayNumber, String number, String countryIso, int callType);
+ void onUnblock(String displayNumber, String number, String countryIso, Integer blockId,
+ boolean isSpam, int callType);
+ void onReportNotSpam(String displayNumber, String number, String countryIso, int callType);
}
/** The root view of the call log list item */
@@ -672,13 +675,25 @@
numberType, /* phone number type (e.g. mobile) in second line of contact view */
accountHandle);
} else if (view.getId() == R.id.block_report_action) {
- mBlockReportListener.onBlockReportSpam(number, countryIso, displayNumber);
+ maybeShowBlockNumberMigrationDialog(new BlockedNumbersMigrator.Listener() {
+ @Override
+ public void onComplete() {
+ mBlockReportListener.onBlockReportSpam(
+ displayNumber, number, countryIso, callType);
+ }
+ });
} else if (view.getId() == R.id.block_action) {
- mBlockReportListener.onBlock(number, countryIso, displayNumber);
+ maybeShowBlockNumberMigrationDialog(new BlockedNumbersMigrator.Listener() {
+ @Override
+ public void onComplete() {
+ mBlockReportListener.onBlock(displayNumber, number, countryIso, callType);
+ }
+ });
} else if (view.getId() == R.id.unblock_action) {
- mBlockReportListener.onUnblock(number, countryIso, blockId, displayNumber);
+ mBlockReportListener.onUnblock(
+ displayNumber, number, countryIso, blockId, isSpam, callType);
} else if (view.getId() == R.id.report_not_spam_action) {
- mBlockReportListener.onReportNotSpam(number, countryIso, displayNumber);
+ mBlockReportListener.onReportNotSpam(displayNumber, number, countryIso, callType);
} else {
final IntentProvider intentProvider = (IntentProvider) view.getTag();
if (intentProvider != null) {
@@ -691,6 +706,14 @@
}
}
+ private void maybeShowBlockNumberMigrationDialog(BlockedNumbersMigrator.Listener listener) {
+ if (!FilteredNumberCompat.maybeShowBlockNumberMigrationDialog(
+ mContext.getContentResolver(),
+ ((Activity) mContext).getFragmentManager(), listener)) {
+ listener.onComplete();
+ }
+ }
+
@NeededForTesting
public static CallLogListItemViewHolder createForTest(Context context) {
Resources resources = context.getResources();
diff --git a/src/com/android/dialer/compat/FilteredNumberCompat.java b/src/com/android/dialer/compat/FilteredNumberCompat.java
index 91563dc..ea994c9 100644
--- a/src/com/android/dialer/compat/FilteredNumberCompat.java
+++ b/src/com/android/dialer/compat/FilteredNumberCompat.java
@@ -238,6 +238,27 @@
}
/**
+ * Shows block number migration dialog if necessary.
+ *
+ * @param fragmentManager The {@link FragmentManager} used to show fragments.
+ * @param listener The {@link BlockedNumbersMigrator.Listener} to call when migration is
+ * complete.
+ * @return boolean True if migration dialog is shown.
+ */
+ public static boolean maybeShowBlockNumberMigrationDialog(
+ ContentResolver contentResolver, FragmentManager fragmentManager,
+ BlockedNumbersMigrator.Listener listener) {
+ if (shouldShowMigrationDialog(true)) {
+ Log.i(TAG, "maybeShowBlockNumberMigrationDialog - showing migration dialog");
+ MigrateBlockedNumbersDialogFragment
+ .newInstance(new BlockedNumbersMigrator(contentResolver), listener)
+ .show(fragmentManager, "MigrateBlockedNumbers");
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Shows the flow of {@link android.app.DialogFragment}s for blocking or unblocking numbers.
*
* @param blockId The id into the blocked numbers database.
diff --git a/src/com/android/dialer/service/ExtendedCallInfoService.java b/src/com/android/dialer/service/ExtendedCallInfoService.java
index 412cece..0bf5bad 100644
--- a/src/com/android/dialer/service/ExtendedCallInfoService.java
+++ b/src/com/android/dialer/service/ExtendedCallInfoService.java
@@ -44,13 +44,17 @@
* Reports number as spam.
* @param number The number to be reported.
* @param countryIso The country ISO of the number.
+ * @param callType Whether the type of call is missed, voicemail, etc. Example of this is
+ * {@link android.provider.CallLog.Calls#VOICEMAIL_TYPE}.
*/
- void reportSpam(String number, String countryIso);
+ void reportSpam(String number, String countryIso, int callType);
/**
* Reports number as not spam.
* @param number The number to be reported.
* @param countryIso The country ISO of the number.
+ * @param callType Whether the type of call is missed, voicemail, etc. Example of this is
+ * {@link android.provider.CallLog.Calls#VOICEMAIL_TYPE}.
*/
- void reportNotSpam(String number, String countryIso);
+ void reportNotSpam(String number, String countryIso, int callType);
}
diff --git a/tests/src/com/android/dialer/calllog/BlockReportSpamListenerTest.java b/tests/src/com/android/dialer/calllog/BlockReportSpamListenerTest.java
new file mode 100644
index 0000000..f505818
--- /dev/null
+++ b/tests/src/com/android/dialer/calllog/BlockReportSpamListenerTest.java
@@ -0,0 +1,70 @@
+package com.android.dialer.calllog;
+
+import android.support.v7.widget.RecyclerView;
+import android.test.ActivityInstrumentationTestCase2;
+
+import com.android.dialer.DialtactsActivity;
+import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.service.ExtendedCallInfoService;
+
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Unit tests for {@link BlockReportSpamListener}.
+ */
+public class BlockReportSpamListenerTest extends ActivityInstrumentationTestCase2<DialtactsActivity> {
+
+ private static final String TEST_DISPLAY_NUMBER = "(123)456-7890";
+ private static final String TEST_NUMBER = "1234567890";
+ private static final String TEST_COUNTRY_ISO = "us";
+ private static final int TEST_CALL_TYPE = 0;
+ private static final int TEST_CALL_BLOCK_ID = 1;
+
+ private BlockReportSpamListener blockReportSpamListener;
+
+ @Mock private RecyclerView.Adapter adapter;
+ @Mock private ExtendedCallInfoService extendedCallInfoService;
+ @Mock private FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
+
+ public BlockReportSpamListenerTest() {
+ super(DialtactsActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ MockitoAnnotations.initMocks(this);
+
+ blockReportSpamListener = new BlockReportSpamListener(getActivity(), adapter,
+ extendedCallInfoService, filteredNumberAsyncQueryHandler);
+ }
+
+ public void testOnBlockReportSpam() {
+ blockReportSpamListener.onBlockReportSpam(
+ TEST_DISPLAY_NUMBER, TEST_NUMBER, TEST_COUNTRY_ISO, TEST_CALL_TYPE);
+ }
+
+ public void testOnBlock() {
+ blockReportSpamListener.onBlock(
+ TEST_DISPLAY_NUMBER, TEST_NUMBER, TEST_COUNTRY_ISO, TEST_CALL_TYPE);
+ }
+
+ public void testOnUnlock_isSpam() {
+ blockReportSpamListener.onUnblock(
+ TEST_DISPLAY_NUMBER, TEST_NUMBER, TEST_COUNTRY_ISO, TEST_CALL_BLOCK_ID,
+ true, TEST_CALL_TYPE);
+ }
+
+ public void testOnUnlock_isNotSpam() {
+ blockReportSpamListener.onUnblock(
+ TEST_DISPLAY_NUMBER, TEST_NUMBER, TEST_COUNTRY_ISO, TEST_CALL_BLOCK_ID,
+ false, TEST_CALL_TYPE);
+ }
+
+ public void testOnReportNotSpam() {
+ blockReportSpamListener.onReportNotSpam(
+ TEST_DISPLAY_NUMBER, TEST_NUMBER, TEST_COUNTRY_ISO, TEST_CALL_TYPE);
+ }
+}