Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Dialer into leaf-3.2
Change-Id: I1aa163ce85ccd2c52702e8120246ae825e9e1b76
diff --git a/README b/README
deleted file mode 100644
index 15142ba..0000000
--- a/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This app is not actively supported and the source is only available as a reference. This project will be removed from the source manifest sometime in the future.
-
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 214c236..30f6640 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
@@ -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 discador como o aplicativo de telefone padrão para usá-lo.</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_action">Definir como padrão</string>
</resources>
diff --git a/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml b/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
index 374220b..02fa8d9 100644
--- a/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
+++ b/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
@@ -16,6 +16,7 @@
limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="call_stats_detail_title">Detalhes das estatísticas do contato</string>
<string name="call_stats_incoming">Recebidas: <xliff:g id="value">%s</xliff:g></string>
<string name="call_stats_outgoing">Efetuadas: <xliff:g id="value">%s</xliff:g></string>
<string name="call_stats_missed">Perdidas: <xliff:g id="value">%s</xliff:g></string>
diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java
index e0d92c8..0365ab9 100644
--- a/java/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/java/com/android/dialer/database/DialerDatabaseHelper.java
@@ -67,7 +67,7 @@
* 0-98 KitKat
* </pre>
*/
- public static final int DATABASE_VERSION = 11;
+ public static final int DATABASE_VERSION = 10;
public static final String DATABASE_NAME = "dialer.db";
@@ -206,11 +206,6 @@
oldVersion = 10;
}
- if (oldVersion < 11) {
- db.execSQL("DROP TABLE IF EXISTS filtered_numbers_table");
- oldVersion = 11;
- }
-
if (oldVersion != DATABASE_VERSION) {
throw new IllegalStateException(
"error upgrading the database to version " + DATABASE_VERSION);
@@ -239,6 +234,10 @@
return;
}
+ if (oldVersion == 11) {
+ oldVersion = 10;
+ }
+
if (oldVersion == 70011) {
oldVersion = 10;
}
diff --git a/java/com/android/voicemail/impl/configui/res/values-in/lineage_strings.xml b/java/com/android/voicemail/impl/configui/res/values-in/lineage_strings.xml
new file mode 100644
index 0000000..af85334
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-in/lineage_strings.xml
@@ -0,0 +1,18 @@
+<?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">Sinkronisasi</string>
+</resources>