Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Dialer into leaf-3.2
Change-Id: Ic50dedd269bdcd3f718b2f4deeae0e1f48572885
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 677e757..1f0fbee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -90,6 +90,7 @@
<uses-permission android:name="com.android.dialer.permission.DIALER_ORIGIN" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" />
@@ -560,7 +561,7 @@
android:name="com.android.incallui.InCallServiceImpl"
android:directBootAware="true"
android:exported="true"
- android:foregroundServiceType="phoneCall"
+ android:foregroundServiceType="phoneCall|microphone"
android:permission="android.permission.BIND_INCALL_SERVICE">
<meta-data
android:name="android.telecom.IN_CALL_SERVICE_UI"
diff --git a/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
index 30f6640..7c03d86 100644
--- a/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
@@ -17,9 +17,9 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="incall_category_title">Em chamada</string>
- <string name="incall_enable_dnd_title">Ativar o modo Não Perturbe durante as chamadas</string>
- <string name="incall_vibrate_outgoing_title">Vibrar quando a chamada for atendida</string>
- <string name="incall_vibrate_call_waiting_title">Vibrar quando uma chamada estiver em espera</string>
+ <string name="incall_enable_dnd_title">Ativar o modo Não Perturbe</string>
+ <string name="incall_vibrate_outgoing_title">Vibrar ao atender</string>
+ <string name="incall_vibrate_call_waiting_title">Vibrar com chamada em espera</string>
<string name="incall_vibrate_hangup_title">Vibrar ao encerrar</string>
<string name="incall_vibrate_45_title">Vibrar a cada minuto</string>
<string name="incall_vibrate_45_summary">Vibrar aos 45 segundos de cada minuto durante chamadas efetuadas</string>
@@ -32,6 +32,6 @@
<string name="call_via_dialog_title">Chamar via\u2026</string>
<string name="call_log_stats_title">Estatísticas</string>
<string name="action_menu_helplines">Linhas de ajuda</string>
- <string name="default_dialer_text">Você deve definir o Telefone como o aplicativo de telefone padrão para usá-lo.</string>
+ <string name="default_dialer_text">Você deve definir o Telefone como o app de telefone padrão para usá-lo.</string>
<string name="default_dialer_action">Definir como padrão</string>
</resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rBR/cm_strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rBR/cm_strings.xml
index e791737..d4b9d24 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rBR/cm_strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rBR/cm_strings.xml
@@ -19,5 +19,5 @@
<item quantity="one">Reproduzir a gravação</item>
<item quantity="other">Reproduzir as gravações</item>
</plurals>
- <string name="call_playback_no_app_found_toast">Não foi encontrado nenhum aplicativo para reproduzir a gravação selecionada.</string>
+ <string name="call_playback_no_app_found_toast">Não foi encontrado nenhum app para reproduzir a gravação selecionada.</string>
</resources>
diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index a76cd17..0c5d950 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -180,7 +180,8 @@
public void startForegroundNotification(int id, Notification notification) {
Assert.isNotNull(
inCallService, "No inCallService available for starting foreground notification");
- inCallService.startForeground(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL);
+ inCallService.startForeground(id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL
+ | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
}
/**
diff --git a/java/com/android/voicemail/impl/configui/res/values-it/lineage_strings.xml b/java/com/android/voicemail/impl/configui/res/values-it/lineage_strings.xml
new file mode 100644
index 0000000..08d07a4
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-it/lineage_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="sync_preference_title">Sincronizzazione</string>
+ <string name="config_override_preference_title">Sovrascrivi configurazione segreteria telefonica</string>
+</resources>