am 8705f034: (-s ours) Merge "DO NOT MERGE Fix potential mismatched caller information" into ub-contactsdialer-a-dev
* commit '8705f0344c1bb1f626b03114c5996b334cc44564':
DO NOT MERGE Fix potential mismatched caller information
diff --git a/InCallUI/res/values-az-rAZ/strings.xml b/InCallUI/res/values-az-rAZ/strings.xml
index e085b4a..61e1361 100644
--- a/InCallUI/res/values-az-rAZ/strings.xml
+++ b/InCallUI/res/values-az-rAZ/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Quraşdırma"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Ayarlanmayıb>"</string>
<string name="other_settings" msgid="3672912580359716394">"Digər zəng parametrləri"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsi ilə zəng edilir"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzərindən"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə gələn"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kontakt fotosu"</string>
<string name="goPrivate" msgid="865837794424530980">"şəxsi rejimə keçin"</string>
diff --git a/InCallUI/res/values-bn-rBD/strings.xml b/InCallUI/res/values-bn-rBD/strings.xml
index 5296fd1..0dedc15 100644
--- a/InCallUI/res/values-bn-rBD/strings.xml
+++ b/InCallUI/res/values-bn-rBD/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"সেটআপ"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<সেট করা নেই>"</string>
<string name="other_settings" msgid="3672912580359716394">"অন্যান্য কল সেটিংস"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে কল করা হচ্ছে"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর দ্বারা কল হচ্ছে"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে ইনকামিং কল"</string>
<string name="contactPhoto" msgid="4713193418046639466">"পরিচিতির ফটো"</string>
<string name="goPrivate" msgid="865837794424530980">"ব্যক্তিগতভাবে কাজ করুন"</string>
diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index feab689..076cb24 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Configuració"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<No definit>"</string>
<string name="other_settings" msgid="3672912580359716394">"Altres opcions de trucades"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Trucada mitjançant <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Trucada amb <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Entrant mitjançant <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"foto de contacte"</string>
<string name="goPrivate" msgid="865837794424530980">"passa a privat"</string>
diff --git a/InCallUI/res/values-cs/strings.xml b/InCallUI/res/values-cs/strings.xml
index ecef8d8..52db3e8 100644
--- a/InCallUI/res/values-cs/strings.xml
+++ b/InCallUI/res/values-cs/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Konfigurace"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nenastaveno>"</string>
<string name="other_settings" msgid="3672912580359716394">"Další nastavení hovorů"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Volání prostřednictvím poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Volání přes <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Příchozí hovor přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"fotografie kontaktu"</string>
<string name="goPrivate" msgid="865837794424530980">"přepnout na soukromé"</string>
diff --git a/InCallUI/res/values-de/strings.xml b/InCallUI/res/values-de/strings.xml
index 21d3b73..a921fb9 100644
--- a/InCallUI/res/values-de/strings.xml
+++ b/InCallUI/res/values-de/strings.xml
@@ -23,7 +23,7 @@
<string name="private_num" msgid="6713286113000232309">"Private Nummer"</string>
<string name="payphone" msgid="4793877574636445118">"Münztelefon"</string>
<string name="confCall" msgid="1904840547188336828">"Telefonkonferenz"</string>
- <string name="call_lost" msgid="6183862117003999578">"Anruf abgebrochen"</string>
+ <string name="call_lost" msgid="6183862117003999578">"Verbindung unterbrochen"</string>
<string name="audio_mode_speaker" msgid="27649582100085266">"Lautsprecher"</string>
<string name="audio_mode_earpiece" msgid="4156527186373869107">"Handy-Kopfhörer"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabelgebundenes Headset"</string>
diff --git a/InCallUI/res/values-es-rUS/strings.xml b/InCallUI/res/values-es-rUS/strings.xml
index 500d87d..71ba0b7 100644
--- a/InCallUI/res/values-es-rUS/strings.xml
+++ b/InCallUI/res/values-es-rUS/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Sin configurar>"</string>
<string name="other_settings" msgid="3672912580359716394">"Otras configuraciones de llamada"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Llamada vía <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Recibidas a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"foto de contacto"</string>
<string name="goPrivate" msgid="865837794424530980">"pasar a modo privado"</string>
diff --git a/InCallUI/res/values-es/strings.xml b/InCallUI/res/values-es/strings.xml
index dd915da..a33f9d5 100644
--- a/InCallUI/res/values-es/strings.xml
+++ b/InCallUI/res/values-es/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<No definido>"</string>
<string name="other_settings" msgid="3672912580359716394">"Otras opciones de llamada"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Llamada vía <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Recibidas a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"foto de contacto"</string>
<string name="goPrivate" msgid="865837794424530980">"llamada privada"</string>
diff --git a/InCallUI/res/values-fa/strings.xml b/InCallUI/res/values-fa/strings.xml
index 2a3ea62..1876602 100644
--- a/InCallUI/res/values-fa/strings.xml
+++ b/InCallUI/res/values-fa/strings.xml
@@ -96,7 +96,7 @@
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"در حال روشن کردن رادیو..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"نمیتوانید تماس بگیرید. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست."</string>
- <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شمارهگیری کنید."</string>
+ <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شمارهگیری کنید."</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحهکلید برای شماره گیری"</string>
<string name="onscreenHoldText_unselected" msgid="7092499303393171276">"نگه داشتن تماس"</string>
<string name="onscreenHoldText_selected" msgid="7127901498507384249">"از سرگیری تماس"</string>
diff --git a/InCallUI/res/values-fi/strings.xml b/InCallUI/res/values-fi/strings.xml
index 09b6f94..4590788 100644
--- a/InCallUI/res/values-fi/strings.xml
+++ b/InCallUI/res/values-fi/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Asetukset"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Ei asetettu>"</string>
<string name="other_settings" msgid="3672912580359716394">"Muut puheluasetukset"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Käytetään operaattoria <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Operaattorilla <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Saapuva puhelu (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
<string name="contactPhoto" msgid="4713193418046639466">"yhteyshenkilön valokuva"</string>
<string name="goPrivate" msgid="865837794424530980">"muuta yksityiseksi"</string>
diff --git a/InCallUI/res/values-gl-rES/strings.xml b/InCallUI/res/values-gl-rES/strings.xml
index bb58cc0..b96ec40 100644
--- a/InCallUI/res/values-gl-rES/strings.xml
+++ b/InCallUI/res/values-gl-rES/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Sen configurar>"</string>
<string name="other_settings" msgid="3672912580359716394">"Outras configuracións de chamada"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Chamando a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Chamada mediante <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Chamadas entrantes a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"foto do contacto"</string>
<string name="goPrivate" msgid="865837794424530980">"activar o modo privado"</string>
diff --git a/InCallUI/res/values-hi/strings.xml b/InCallUI/res/values-hi/strings.xml
index 6ab12d1..b60237c 100644
--- a/InCallUI/res/values-hi/strings.xml
+++ b/InCallUI/res/values-hi/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<सेट नहीं है>"</string>
<string name="other_settings" msgid="3672912580359716394">"अन्य कॉल सेटिंग"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के माध्यम से कॉल किया जा रहा है"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"कॉल <xliff:g id="PROVIDER_NAME">%s</xliff:g> से जा रही है"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> की ओर से इनकमिंग"</string>
<string name="contactPhoto" msgid="4713193418046639466">"संपर्क का फ़ोटो"</string>
<string name="goPrivate" msgid="865837794424530980">"निजी हो जाएं"</string>
diff --git a/InCallUI/res/values-hr/strings.xml b/InCallUI/res/values-hr/strings.xml
index 5d727c2..d40c2f9 100644
--- a/InCallUI/res/values-hr/strings.xml
+++ b/InCallUI/res/values-hr/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Postavljanje"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nije postavljeno>"</string>
<string name="other_settings" msgid="3672912580359716394">"Ostale postavke poziva"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Pozivanje putem operatera <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Poziv preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Dolazni pozivi putem davatelja <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kontakt fotografija"</string>
<string name="goPrivate" msgid="865837794424530980">"na privatno"</string>
diff --git a/InCallUI/res/values-hu/strings.xml b/InCallUI/res/values-hu/strings.xml
index 82a5f1e..e842183 100644
--- a/InCallUI/res/values-hu/strings.xml
+++ b/InCallUI/res/values-hu/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Beállítás"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nincs megadva>"</string>
<string name="other_settings" msgid="3672912580359716394">"Egyéb hívásbeállítások"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Hívás a(z) <xliff:g id="PROVIDER_NAME">%s</xliff:g> szolgáltatón keresztül"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Hívás (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Bejövő hívás a következőn keresztül: <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"ismerős fotója"</string>
<string name="goPrivate" msgid="865837794424530980">"magánbeszélgetés"</string>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 935dd22..95e6542 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Կարգավորում"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Նշված չէ>"</string>
<string name="other_settings" msgid="3672912580359716394">"Այլ զանգերի կարգավորումներ"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Զանգում է <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի միջոցով"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Զանգ <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի միջոցով"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Մուտքային զանգ <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի ցանցից"</string>
<string name="contactPhoto" msgid="4713193418046639466">"կոնտակտի լուսանկարը"</string>
<string name="goPrivate" msgid="865837794424530980">"Անցնել անձնականի"</string>
diff --git a/InCallUI/res/values-kk-rKZ/strings.xml b/InCallUI/res/values-kk-rKZ/strings.xml
index 87c9216..4ece696 100644
--- a/InCallUI/res/values-kk-rKZ/strings.xml
+++ b/InCallUI/res/values-kk-rKZ/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Орнату"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Реттелген жоқt>"</string>
<string name="other_settings" msgid="3672912580359716394">"Басқа қоңырау параметрлері"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы қоңырау шалу"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы шалу"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы кіріс"</string>
<string name="contactPhoto" msgid="4713193418046639466">"контакт фотосуреті"</string>
<string name="goPrivate" msgid="865837794424530980">"жеке қоңырауға ауысу"</string>
diff --git a/InCallUI/res/values-kn-rIN/strings.xml b/InCallUI/res/values-kn-rIN/strings.xml
index 36d9bee..bfac2ce 100644
--- a/InCallUI/res/values-kn-rIN/strings.xml
+++ b/InCallUI/res/values-kn-rIN/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"ಸೆಟಪ್"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<ಹೊಂದಿಸಿಲ್ಲ>"</string>
<string name="other_settings" msgid="3672912580359716394">"ಇತರ ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>ನಿಂದ ಕರೆ ಆಗುತ್ತಿದೆ"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಅವರ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
<string name="contactPhoto" msgid="4713193418046639466">"ಸಂಪರ್ಕ ಫೋಟೋ"</string>
<string name="goPrivate" msgid="865837794424530980">"ಖಾಸಗಿಯಾಗಿ ಹೋಗಿ"</string>
diff --git a/InCallUI/res/values-lt/strings.xml b/InCallUI/res/values-lt/strings.xml
index b79eee8..e665272 100644
--- a/InCallUI/res/values-lt/strings.xml
+++ b/InCallUI/res/values-lt/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Sąranka"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nenustatyta>"</string>
<string name="other_settings" msgid="3672912580359716394">"Kiti skambučio nustatymai"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Skambinama naudojantis „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ paslaugomis"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Skam. naudojant „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Gaunama per „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kontakto nuotrauka"</string>
<string name="goPrivate" msgid="865837794424530980">"naudoti privatų režimą"</string>
diff --git a/InCallUI/res/values-lv/strings.xml b/InCallUI/res/values-lv/strings.xml
index 00a5903..da88336 100644
--- a/InCallUI/res/values-lv/strings.xml
+++ b/InCallUI/res/values-lv/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Iestatīšana"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nav iestatīts>"</string>
<string name="other_settings" msgid="3672912580359716394">"Citi zvanu iestatījumi"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Zvans, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Zvanu nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Ienākošie zvani, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kontaktpersonas fotoattēls"</string>
<string name="goPrivate" msgid="865837794424530980">"pārslēgt uz privāto režīmu"</string>
diff --git a/InCallUI/res/values-ml-rIN/strings.xml b/InCallUI/res/values-ml-rIN/strings.xml
index bc4900f..fb4e62b 100644
--- a/InCallUI/res/values-ml-rIN/strings.xml
+++ b/InCallUI/res/values-ml-rIN/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"സജ്ജമാക്കുക"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<സജ്ജീകരിച്ചിട്ടില്ല>"</string>
<string name="other_settings" msgid="3672912580359716394">"മറ്റ് കോൾ ക്രമീകരണങ്ങൾ"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേന വിളിക്കുന്നു"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> വഴി വിളിക്കുന്നു"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേനയുള്ള ഇൻകമിംഗ്"</string>
<string name="contactPhoto" msgid="4713193418046639466">"കോൺടാക്റ്റ് ഫോട്ടോ"</string>
<string name="goPrivate" msgid="865837794424530980">"സ്വകാര്യം എന്നതിലേക്ക് പോകുക"</string>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index 69fa1ba..4bfcbe5 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<सेट नाही>"</string>
<string name="other_settings" msgid="3672912580359716394">"इतर कॉल सेटिंग्ज"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे कॉल करीत आहे"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे कॉल करत आहे"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे येणारे"</string>
<string name="contactPhoto" msgid="4713193418046639466">"संपर्क फोटो"</string>
<string name="goPrivate" msgid="865837794424530980">"खाजगी जा"</string>
diff --git a/InCallUI/res/values-nl/strings.xml b/InCallUI/res/values-nl/strings.xml
index 206e110..974ef5f 100644
--- a/InCallUI/res/values-nl/strings.xml
+++ b/InCallUI/res/values-nl/strings.xml
@@ -50,8 +50,8 @@
<string name="card_title_video_call_requesting" msgid="4587504939739340937">"Video aanvragen"</string>
<string name="card_title_video_call_error" msgid="9000555878389539225">"Kan geen videogesprek starten"</string>
<string name="card_title_video_call_rejected" msgid="462358296694719787">"Videoverzoek geweigerd"</string>
- <string name="card_title_callback_number" msgid="7307938207564217293">"Uw terugbelnummer\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
- <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Uw terugbelnummer bij alarm\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+ <string name="card_title_callback_number" msgid="7307938207564217293">"Je terugbelnummer\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+ <string name="card_title_callback_number_emergency" msgid="8634765419223426754">"Je terugbelnummer bij alarm\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
<string name="notification_dialing" msgid="2107666444937350731">"Kiezen"</string>
<string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
<string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepen"</string>
@@ -78,10 +78,10 @@
<string name="notification_action_dismiss" msgid="2679969397930852858">"Sluiten"</string>
<string name="notification_missedCall_call_back" msgid="2684890353590890187">"Terugbellen"</string>
<string name="notification_missedCall_message" msgid="3049928912736917988">"Bericht"</string>
- <string name="incall_error_power_off" msgid="6550191216405193368">"Als u wilt bellen, moet u eerst de Vliegtuigmodus uitschakelen."</string>
+ <string name="incall_error_power_off" msgid="6550191216405193368">"Als je wilt bellen, moet je eerst de Vliegtuigmodus uitschakelen."</string>
<string name="incall_error_emergency_only" msgid="4678640422710818317">"Niet geregistreerd op netwerk."</string>
<string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobiel netwerk niet beschikbaar."</string>
- <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Als u wilt bellen, moet u een geldig nummer invoeren."</string>
+ <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Als je wilt bellen, moet je een geldig nummer invoeren."</string>
<string name="incall_error_call_failed" msgid="6302746943230078197">"Kan niet bellen."</string>
<string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-reeks starten..."</string>
<string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Service wordt niet ondersteund."</string>
diff --git a/InCallUI/res/values-pl/strings.xml b/InCallUI/res/values-pl/strings.xml
index 9d2baee..3db8393 100644
--- a/InCallUI/res/values-pl/strings.xml
+++ b/InCallUI/res/values-pl/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Konfiguracja"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nie ustawiono>"</string>
<string name="other_settings" msgid="3672912580359716394">"Inne ustawienia połączeń"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Nawiązywanie połączenia przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Połączenie przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Przychodzące przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"zdjęcie kontaktu"</string>
<string name="goPrivate" msgid="865837794424530980">"przejdź do rozmowy prywatnej"</string>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 43e4dba..62a1ec6 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Configuração"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Não definido>"</string>
<string name="other_settings" msgid="3672912580359716394">"Outras definições de chamada"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"A chamar através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"A chamar via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Recebida através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"fotografia do contacto"</string>
<string name="goPrivate" msgid="865837794424530980">"tornar privado"</string>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index 46e5392..33e289c 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -28,9 +28,9 @@
<string name="audio_mode_earpiece" msgid="4156527186373869107">"Casca dispozitivului"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Cască cu fir"</string>
<string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
- <string name="wait_prompt_str" msgid="7601815427707856238">"Trimiteţi următoarele tonuri?\n"</string>
+ <string name="wait_prompt_str" msgid="7601815427707856238">"Trimiteți următoarele tonuri?\n"</string>
<string name="pause_prompt_str" msgid="1789964702154314806">"Se trimit tonuri\n"</string>
- <string name="send_button" msgid="4106860097497818751">"Trimiteţi"</string>
+ <string name="send_button" msgid="4106860097497818751">"Trimiteți"</string>
<string name="pause_prompt_yes" msgid="3564467212025151797">"Da"</string>
<string name="pause_prompt_no" msgid="6686238803236884877">"Nu"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Înlocuiţi metacaracterul cu"</string>
@@ -132,7 +132,7 @@
<string name="custom_message_cancel" msgid="7516406059429609296">"Anulați"</string>
<string name="custom_message_send" msgid="5795754217085747742">"Trimiteți"</string>
<string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
- <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
+ <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteți SMS"</string>
<string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
<string name="description_target_answer_video_call" msgid="3495965588512395026">"Răspundeți ca apel video"</string>
<string name="description_target_answer_audio_call" msgid="8396296303320994450">"Răspundeți ca apel audio"</string>
@@ -146,8 +146,8 @@
<string name="description_direction_left" msgid="7129873384376533287">"Glisați spre stânga pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
<string name="description_direction_right" msgid="2122584234531957308">"Glisați spre dreapta pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
<string name="description_direction_down" msgid="4317245625565166742">"Glisați în jos pentru <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
- <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
- <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
+ <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrații"</string>
+ <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrații"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
<string name="default_notification_description" msgid="78174796906240970">"Sunet prestabilit (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
<string name="ringtone_title" msgid="6374978286202084684">"Ton de apel telefon"</string>
diff --git a/InCallUI/res/values-ru/strings.xml b/InCallUI/res/values-ru/strings.xml
index a8c386d..9fcecce 100644
--- a/InCallUI/res/values-ru/strings.xml
+++ b/InCallUI/res/values-ru/strings.xml
@@ -75,7 +75,7 @@
<string name="notification_action_answer_video" msgid="7809271910870211729">"Видео"</string>
<string name="notification_action_answer_voice" msgid="1770796916369437773">"Голосовой вызов"</string>
<string name="notification_action_accept" msgid="2898609801209468429">"Принять"</string>
- <string name="notification_action_dismiss" msgid="2679969397930852858">"Закрыть"</string>
+ <string name="notification_action_dismiss" msgid="2679969397930852858">"Отклонить"</string>
<string name="notification_missedCall_call_back" msgid="2684890353590890187">"Позвонить"</string>
<string name="notification_missedCall_message" msgid="3049928912736917988">"Написать"</string>
<string name="incall_error_power_off" msgid="6550191216405193368">"Перед тем как звонить, отключите режим полета."</string>
diff --git a/InCallUI/res/values-sk/strings.xml b/InCallUI/res/values-sk/strings.xml
index dc028bb..2ab470d 100644
--- a/InCallUI/res/values-sk/strings.xml
+++ b/InCallUI/res/values-sk/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Nastavenie"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Nenastavené>"</string>
<string name="other_settings" msgid="3672912580359716394">"Ďalšie nastavenia hovorov"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Voláte prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Volanie cez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Prichádz. hovor prostred. poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"fotografia kontaktu"</string>
<string name="goPrivate" msgid="865837794424530980">"prepnúť na súkromné"</string>
diff --git a/InCallUI/res/values-sl/strings.xml b/InCallUI/res/values-sl/strings.xml
index 05a507a..849ec85 100644
--- a/InCallUI/res/values-sl/strings.xml
+++ b/InCallUI/res/values-sl/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Nastavitev"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Ni nastavljeno>"</string>
<string name="other_settings" msgid="3672912580359716394">"Druge nastavitve klicev"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Klicanje prek ponudnika <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Klicanje prek <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Dohodni prek <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"fotografija stika"</string>
<string name="goPrivate" msgid="865837794424530980">"zasebno"</string>
diff --git a/InCallUI/res/values-sq-rAL/strings.xml b/InCallUI/res/values-sq-rAL/strings.xml
index 171d7c6..5061597 100644
--- a/InCallUI/res/values-sq-rAL/strings.xml
+++ b/InCallUI/res/values-sq-rAL/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Konfigurimi"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<I pavendosur>"</string>
<string name="other_settings" msgid="3672912580359716394">"Cilësime të tjera të telefonatës"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Po telefonon përmes <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Telefonatë përmes <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Hyrëse nga <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"fotografia e kontaktit"</string>
<string name="goPrivate" msgid="865837794424530980">"bëje private"</string>
diff --git a/InCallUI/res/values-sr/strings.xml b/InCallUI/res/values-sr/strings.xml
index ee021d8..032560e 100644
--- a/InCallUI/res/values-sr/strings.xml
+++ b/InCallUI/res/values-sr/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Подешавање"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Није подешено>"</string>
<string name="other_settings" msgid="3672912580359716394">"Друга подешавања позива"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Позивање преко добављача <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Позивање преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Долазна преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"фотографија контакта"</string>
<string name="goPrivate" msgid="865837794424530980">"иди на приватно"</string>
diff --git a/InCallUI/res/values-sw/strings.xml b/InCallUI/res/values-sw/strings.xml
index 3d60118..618e53b 100644
--- a/InCallUI/res/values-sw/strings.xml
+++ b/InCallUI/res/values-sw/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Sanidi"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Haijawekwa>"</string>
<string name="other_settings" msgid="3672912580359716394">"Mipangilio mingine ya simu"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Kupiga simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Inapiga kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Simu zinazoingia kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"picha ya anwani"</string>
<string name="goPrivate" msgid="865837794424530980">"nenda kwa faragha"</string>
diff --git a/InCallUI/res/values-te-rIN/strings.xml b/InCallUI/res/values-te-rIN/strings.xml
index ec8abe2..83e35db 100644
--- a/InCallUI/res/values-te-rIN/strings.xml
+++ b/InCallUI/res/values-te-rIN/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"సెటప్"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<సెట్ చేయలేదు>"</string>
<string name="other_settings" msgid="3672912580359716394">"ఇతర కాల్ సెట్టింగ్లు"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా కాల్ చేయబడుతోంది"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>తో కాల్ వెళుతోంది"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా ఇన్కమింగ్"</string>
<string name="contactPhoto" msgid="4713193418046639466">"పరిచయ ఫోటో"</string>
<string name="goPrivate" msgid="865837794424530980">"ప్రైవేట్గా వెళ్లు"</string>
diff --git a/InCallUI/res/values-tl/strings.xml b/InCallUI/res/values-tl/strings.xml
index 420f135..30018b3 100644
--- a/InCallUI/res/values-tl/strings.xml
+++ b/InCallUI/res/values-tl/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Hindi nakatakda>"</string>
<string name="other_settings" msgid="3672912580359716394">"Iba pang mga setting ng tawag"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Tumatawag sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Tumatawag via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Papasok sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"larawan ng contact"</string>
<string name="goPrivate" msgid="865837794424530980">"maging pribado"</string>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 746087a..018aaf8 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Kurulum"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Ayarlanmadı>"</string>
<string name="other_settings" msgid="3672912580359716394">"Diğer çağrı ayarları"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden çağrı yapılıyor"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> adlı sağlayıcı üzerinden gelen çağrı"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kişi fotoğrafı"</string>
<string name="goPrivate" msgid="865837794424530980">"özele git"</string>
diff --git a/InCallUI/res/values-uk/strings.xml b/InCallUI/res/values-uk/strings.xml
index 8c77b33..2250135 100644
--- a/InCallUI/res/values-uk/strings.xml
+++ b/InCallUI/res/values-uk/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Налаштування"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Не встановлено>"</string>
<string name="other_settings" msgid="3672912580359716394">"Інші налаштування виклику"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"Виклик здійснюється за допомогою <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"Виклик через <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Вхідні дзвінки через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="contactPhoto" msgid="4713193418046639466">"фото контакта"</string>
<string name="goPrivate" msgid="865837794424530980">"конфіденц."</string>
diff --git a/InCallUI/res/values-ur-rPK/strings.xml b/InCallUI/res/values-ur-rPK/strings.xml
index 81984cb..5a4d39e 100644
--- a/InCallUI/res/values-ur-rPK/strings.xml
+++ b/InCallUI/res/values-ur-rPK/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"سیٹ اپ"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<سیٹ نہیں ہے>"</string>
<string name="other_settings" msgid="3672912580359716394">"دیگر کال کی ترتیبات"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> کی معرفت کال ہو رہی ہے"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"کالنگ بذریعہ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> کے ذریعے موصول ہونے والی"</string>
<string name="contactPhoto" msgid="4713193418046639466">"رابطہ کی تصویر"</string>
<string name="goPrivate" msgid="865837794424530980">"نجی ہوجائیں"</string>
diff --git a/InCallUI/res/values-uz-rUZ/strings.xml b/InCallUI/res/values-uz-rUZ/strings.xml
index 7553c64..1cacec8 100644
--- a/InCallUI/res/values-uz-rUZ/strings.xml
+++ b/InCallUI/res/values-uz-rUZ/strings.xml
@@ -123,7 +123,7 @@
<string name="voicemail_settings" msgid="72448049107749316">"Sozlash"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<Ko‘rsatilmagan>"</string>
<string name="other_settings" msgid="3672912580359716394">"Boshqa qo‘ng‘iroq sozlamalari"</string>
- <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
+ <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘iroq"</string>
<string name="incoming_via_template" msgid="1696993226115570960">"Kiruvchi qo‘ng‘iroqlar <xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali"</string>
<string name="contactPhoto" msgid="4713193418046639466">"kontakt surati"</string>
<string name="goPrivate" msgid="865837794424530980">"alohidaga o‘tish"</string>
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index d1cb623..c82b7a5 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -33,6 +33,7 @@
import android.telecom.InCallService.VideoCall;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import android.telecom.VideoProfile;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
@@ -368,6 +369,13 @@
private String mChildNumber;
private String mLastForwardedNumber;
private String mCallSubject;
+ private PhoneAccountHandle mPhoneAccountHandle;
+
+ /**
+ * Indicates whether the phone account associated with this call supports specifying a call
+ * subject.
+ */
+ private boolean mIsCallSubjectSupported;
private long mTimeAddedMs;
@@ -488,6 +496,22 @@
mHandle = newHandle;
updateEmergencyCallState();
}
+
+ // If the phone account handle of the call is set, cache capability bit indicating whether
+ // the phone account supports call subjects.
+ PhoneAccountHandle newPhoneAccountHandle = mTelecomCall.getDetails().getAccountHandle();
+ if (!Objects.equals(mPhoneAccountHandle, newPhoneAccountHandle)) {
+ mPhoneAccountHandle = newPhoneAccountHandle;
+
+ if (mPhoneAccountHandle != null) {
+ TelecomManager mgr = InCallPresenter.getInstance().getTelecomManager();
+ PhoneAccount phoneAccount = mgr.getPhoneAccount(mPhoneAccountHandle);
+ if (phoneAccount != null) {
+ mIsCallSubjectSupported = phoneAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_CALL_SUBJECT);
+ }
+ }
+ }
}
private static int translateState(int state) {
@@ -600,6 +624,14 @@
return mCallSubject;
}
+ /**
+ * @return {@code true} if the call's phone account supports call subjects, {@code false}
+ * otherwise.
+ */
+ public boolean isCallSubjectSupported() {
+ return mIsCallSubjectSupported;
+ }
+
/** Returns call disconnect cause, defined by {@link DisconnectCause}. */
public DisconnectCause getDisconnectCause() {
if (mState == State.DISCONNECTED || mState == State.IDLE) {
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index ae1a48a..59f6e7f 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -943,7 +943,9 @@
boolean isIncomingOrWaiting = mPrimary.getState() == Call.State.INCOMING ||
mPrimary.getState() == Call.State.CALL_WAITING;
- return isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject());
+ return isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject()) &&
+ call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED &&
+ call.isCallSubjectSupported();
}
/**
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index 06703b9..2b5d0d4 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -139,6 +139,12 @@
*/
public boolean isCachedPhotoCurrent;
+ /**
+ * String which holds the call subject sent as extra from the lower layers for this call. This
+ * is used to display the no-caller ID reason for restricted/unknown number presentation.
+ */
+ public String callSubject;
+
private boolean mIsEmergency;
private boolean mIsVoiceMail;
diff --git a/InCallUI/src/com/android/incallui/CallerInfoUtils.java b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
index 2cbf456..eab99ea 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoUtils.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
@@ -58,6 +58,7 @@
info.name = info.cnapName;
info.numberPresentation = call.getNumberPresentation();
info.namePresentation = call.getCnapNamePresentation();
+ info.callSubject = call.getCallSubject();
String number = call.getNumber();
if (!TextUtils.isEmpty(number)) {
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index 7de1648..223d1f2 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -444,13 +444,13 @@
if (TextUtils.isEmpty(number)) {
// No name *or* number! Display a generic "unknown" string
// (or potentially some other default based on the presentation.)
- displayName = getPresentationString(context, presentation);
+ displayName = getPresentationString(context, presentation, info.callSubject);
Log.d(TAG, " ==> no name *or* number! displayName = " + displayName);
} else if (presentation != TelecomManager.PRESENTATION_ALLOWED) {
// This case should never happen since the network should never send a phone #
// AND a restricted presentation. However we leave it here in case of weird
// network behavior
- displayName = getPresentationString(context, presentation);
+ displayName = getPresentationString(context, presentation, info.callSubject);
Log.d(TAG, " ==> presentation not allowed! displayName = " + displayName);
} else if (!TextUtils.isEmpty(info.cnapName)) {
// No name, but we do have a valid CNAP name, so use that.
@@ -487,7 +487,7 @@
// This case should never happen since the network should never send a name
// AND a restricted presentation. However we leave it here in case of weird
// network behavior
- displayName = getPresentationString(context, presentation);
+ displayName = getPresentationString(context, presentation, info.callSubject);
Log.d(TAG, " ==> valid name, but presentation not allowed!" +
" displayName = " + displayName);
} else {
@@ -536,14 +536,22 @@
}
/**
- * Gets name strings based on some special presentation modes.
+ * Gets name strings based on some special presentation modes and the associated custom label.
*/
- private static String getPresentationString(Context context, int presentation) {
+ private static String getPresentationString(Context context, int presentation,
+ String customLabel) {
String name = context.getString(R.string.unknown);
- if (presentation == TelecomManager.PRESENTATION_RESTRICTED) {
- name = context.getString(R.string.private_num);
- } else if (presentation == TelecomManager.PRESENTATION_PAYPHONE) {
- name = context.getString(R.string.payphone);
+ if (!TextUtils.isEmpty(customLabel) &&
+ ((presentation == TelecomManager.PRESENTATION_UNKNOWN) ||
+ (presentation == TelecomManager.PRESENTATION_RESTRICTED))) {
+ name = customLabel;
+ return name;
+ } else {
+ if (presentation == TelecomManager.PRESENTATION_RESTRICTED) {
+ name = context.getString(R.string.private_num);
+ } else if (presentation == TelecomManager.PRESENTATION_PAYPHONE) {
+ name = context.getString(R.string.payphone);
+ }
}
return name;
}
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 35a22c9..df29dc2 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -29,6 +29,7 @@
import android.net.Uri;
import android.telecom.Call.Details;
import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
@@ -426,7 +427,9 @@
boolean isIncomingOrWaiting = call.getState() == Call.State.INCOMING ||
call.getState() == Call.State.CALL_WAITING;
- if (isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject())) {
+ if (isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject()) &&
+ call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED &&
+ call.isCallSubjectSupported()) {
return call.getCallSubject();
}