Merge master branch into workaccount-store

play-services-ads-identifier/core/src/main/res/values-ar/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_notification_label">إشعار معرّف الإعلان</string>
+    <string name="perm_ad_id_label">إذن معرّف الإعلان</string>
+    <string name="perm_ad_id_notification_description">يتيح للتطبيق تلقي إشعار عند تحديث معرّف الإعلان أو تحديد تفضيلات تتبع الإعلانات للمستخدم.</string>
+    <string name="perm_ad_id_description">يتيح لتطبيق الناشر بالوصول إلى معرف إعلان صالح بشكل مباشر أو غير مباشر.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-az/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_label">Reklam ID İcazəsi</string>
+    <string name="perm_ad_id_description">Dərc edici tətbiq birbaşa və ya dolayı yolla etibarlı reklam ID-ə keçid icazəsi verir.</string>
+    <string name="perm_ad_id_notification_label">Reklam ID bildirişi</string>
+    <string name="perm_ad_id_notification_description">İstifadəçinin reklam ID-i və ya reklam izləmə seçiminin məhdudlaşdırılması yeniləndikdə, tətbiqə bildiriş almaq icazəsi verir.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-cs/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_label">Oprávnění k reklamnímu ID</string>
+    <string name="perm_ad_id_description">Umožní vydavatelské aplikaci přímý nebo nepřímý přístup k platnému reklamnímu ID.</string>
+    <string name="perm_ad_id_notification_label">Oznámení o reklamním ID</string>
+    <string name="perm_ad_id_notification_description">Umožní aplikaci obdržet oznámení při aktualizaci reklamního ID nebo uživatelské předvolby omezení reklamního sledování.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-de/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="perm_ad_id_notification_description">Erlaubt einer app, eine Benachrichtigung zu erhalten, wenn sich die Werbe-ID ändert oder der Nutzer das Tracking einschränkt.</string>
-    <string name="perm_ad_id_notification_label">Werbe-ID Benachrichtigung</string>
-    <string name="perm_ad_id_description">Erlaubt einer app, direkt oder indirekt, auf die Werbe-ID zuzugreifen.</string>
-    <string name="perm_ad_id_label">Werbe-ID Berechtigung</string>
+    <string name="perm_ad_id_notification_description">Erlaubt einer App, eine Benachrichtigung zu erhalten, wenn sich die Werbe-ID ändert oder der Nutzer das Tracking einschränkt.</string>
+    <string name="perm_ad_id_notification_label">Werbe-ID-Benachrichtigung</string>
+    <string name="perm_ad_id_description">Erlaubt einer App, direkt oder indirekt, auf die Werbe-ID zuzugreifen.</string>
+    <string name="perm_ad_id_label">Werbe-ID-Berechtigung</string>
 </resources>

play-services-ads-identifier/core/src/main/res/values-ga/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="perm_ad_id_notification_description">Ligeann sé d’aip fógra a fháil nuair a nuashonraítear an t-aitheantas fógraíochta nó an rogha rianaithe teorann atá ag an úsáideoir.</string>
+    <string name="perm_ad_id_notification_label">Fógra aitheantais fógraíochta</string>
+    <string name="perm_ad_id_label">Cead ID Fógraíochta</string>
+    <string name="perm_ad_id_description">Ligeann sé d’aip foilsitheora rochtain a fháil ar aitheantas bailí fógraíochta go díreach nó go hindíreach.</string>
+</resources>

play-services-ads-identifier/core/src/main/res/values-is/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-ads-identifier/core/src/main/res/values-ja/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="perm_ad_id_notification_description">ユーザーの広告 ID またはトラッキング拒否設定が更新されたときに、アプリが通知を受信できるようにします。</string>
-    <string name="perm_ad_id_notification_label">広告IDの通知</string>
+    <string name="perm_ad_id_notification_label">広告 ID の通知</string>
     <string name="perm_ad_id_description">外部アプリが有効な広告 ID に直接的または間接的にアクセスできるようにします。</string>
-    <string name="perm_ad_id_label">広告IDの許可</string>
+    <string name="perm_ad_id_label">広告 ID の許可</string>
 </resources>

play-services-ads-identifier/core/src/main/res/values-lzh/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-ads-identifier/core/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="perm_ad_id_label">Permissão do ID de publicidade</string>
-    <string name="perm_ad_id_description">Permite que o aplicativo acesse um ID de publicidade válido diretamente ou indiretamente.</string>
+    <string name="perm_ad_id_description">Permite que o app acesse um ID de publicidade válido diretamente ou indiretamente.</string>
     <string name="perm_ad_id_notification_label">Notificação do ID de publicidade</string>
-    <string name="perm_ad_id_notification_description">Permite que um aplicativo receba uma notificação quando o ID de publicidade muda ou a configuração de limitar rastreamento por anúncios do usuário muda.</string>
+    <string name="perm_ad_id_notification_description">Permite que um app receba uma notificação quando o ID de publicidade muda ou a configuração de limitar rastreamento por anúncios do usuário muda.</string>
 </resources>

play-services-ads-identifier/core/src/main/res/values-tr/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-ads-identifier/core/src/main/res/values-zh-rCN/strings.xml

@@ -3,5 +3,5 @@
     <string name="perm_ad_id_label">广告 ID 权限</string>
     <string name="perm_ad_id_description">允许发布者应用直接或间接地访问广告 ID。</string>
     <string name="perm_ad_id_notification_label">广告 ID 通知</string>
-    <string name="perm_ad_id_notification_description">允许应用在用户的广告 ID 或限制广告跟踪设置更改时得到通知。</string>
+    <string name="perm_ad_id_notification_description">允许应用在用户的广告 ID 或限制广告跟踪设置更改时接收通知。</string>
 </resources>

play-services-ads-identifier/core/src/main/res/values-zh-rTW/strings.xml

@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="perm_ad_id_label">廣告 ID 權限</string>
+    <string name="perm_ad_id_notification_label">廣告 ID 通知</string>
+    <string name="perm_ad_id_notification_description">允許應用程式在使用者更新廣告 ID 或限制廣告追蹤設定時收到通知。</string>
+    <string name="perm_ad_id_description">允許發布商應用程式直接或間接存取有效的廣告 ID。</string>
+</resources>

play-services-auth-api-phone/core/src/main/res/values-ar/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sms_user_consent_deny">رفض</string>
+    <string name="sms_user_consent_allow">سماح</string>
+    <string name="sms_user_consent_title">السماح ل<b>%s</b> بقراءة الرسالة أدناه وإدخال الرمز؟</string>
+</resources>

play-services-auth-api-phone/core/src/main/res/values-az/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-auth-api-phone/core/src/main/res/values-be/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sms_user_consent_title">Дазволіць <b>%s</b> прачытаць паведамленне ніжэй і ўвесці код?</string>
+    <string name="sms_user_consent_title">Дазволіць <b>%s</b> прачытаць паведамленне і ўвесці код?</string>
     <string name="sms_user_consent_allow">Дазволіць</string>
     <string name="sms_user_consent_deny">Адхіліць</string>
 </resources>

play-services-auth-api-phone/core/src/main/res/values-cs/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sms_user_consent_deny">Zakázat</string>
+    <string name="sms_user_consent_title">Povolit aplikaci <b>%s</b> zobrazit zprávu níže a zadat kód?</string>
+    <string name="sms_user_consent_allow">Povolit</string>
+</resources>

play-services-auth-api-phone/core/src/main/res/values-ga/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sms_user_consent_deny">Diúltaigh</string>
+    <string name="sms_user_consent_title">An bhfuil cead ag <b>%s</b> an teachtaireacht thíos a léamh agus an cód a chur isteach?</string>
+    <string name="sms_user_consent_allow">Ceadaigh</string>
+</resources>

play-services-auth-api-phone/core/src/main/res/values-is/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sms_user_consent_title">Leyfa <b>%s</b> að lesa skilaboðin hér fyrir neðan og setja inn kóðann?</string>
+    <string name="sms_user_consent_deny">Hafna</string>
+    <string name="sms_user_consent_allow">Leyfa</string>
+</resources>

play-services-auth-api-phone/core/src/main/res/values-ja/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="sms_user_consent_allow">許可</string>
-    <string name="sms_user_consent_title"><b>%s</b> に以下のメッセージからコードを入力させますか？</string>
+    <string name="sms_user_consent_title"><b>%s</b> に以下のメッセージの読み取りを許可してコードを入力させますか？</string>
     <string name="sms_user_consent_deny">拒否</string>
 </resources>

play-services-auth-api-phone/core/src/main/res/values-lzh/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-auth-api-phone/core/src/main/res/values-pl/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sms_user_consent_allow">Pozwól</string>
-    <string name="sms_user_consent_title">Pozwolić <b>%s</b> na odczyt poniższej wiadomości i wprowadzenie kodu\?</string>
-    <string name="sms_user_consent_deny">Zabroń</string>
+    <string name="sms_user_consent_allow">Zezwól</string>
+    <string name="sms_user_consent_title">Zezwolić <b>%s</b> na odczyt poniższej wiadomości i wprowadzenie kodu?</string>
+    <string name="sms_user_consent_deny">Odmów</string>
 </resources>

play-services-auth-api-phone/core/src/main/res/values-ru/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sms_user_consent_title">Разрешить <b>%s</b> прочитать сообщение ниже и ввести код?</string>
+    <string name="sms_user_consent_title">Разрешить <b>%s</b> прочитать сообщение и ввести код?</string>
     <string name="sms_user_consent_allow">Разрешить</string>
     <string name="sms_user_consent_deny">Отклонить</string>
 </resources>

play-services-auth-api-phone/core/src/main/res/values-tr/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

play-services-auth-api-phone/core/src/main/res/values-zh-rCN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sms_user_consent_title">允许<b>%s</b>读取以下消息并输入代码吗？</string>
+    <string name="sms_user_consent_title">允许<b>%s</b>读取以下消息并输入代码？</string>
     <string name="sms_user_consent_allow">允许</string>
     <string name="sms_user_consent_deny">拒绝</string>
 </resources>

play-services-auth-api-phone/core/src/main/res/values-zh-rTW/strings.xml

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="sms_user_consent_title">允許「<b>%s</b>」閱讀以下訊息並輸入代碼？</string>
+    <string name="sms_user_consent_deny">拒絕</string>
+    <string name="sms_user_consent_allow">允許</string>
+</resources>

play-services-base/core/build.gradle

@@ -33,13 +33,6 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
-        if (localProperties.get("ichnaea.endpoint", "") != "") {
-            buildConfigField "String", "ICHNAEA_ENDPOINT_DEFAULT", "\"${localProperties.get("ichnaea.endpoint")}\""
-        } else if (localProperties.get("ichnaea.key", "") != "") {
-            buildConfigField "String", "ICHNAEA_ENDPOINT_DEFAULT", "\"https://location.services.mozilla.com/?key=${localProperties.get("ichnaea.key")}\""
-        } else {
-            buildConfigField "String", "ICHNAEA_ENDPOINT_DEFAULT", "\"\""
-        }
     }
 
     buildFeatures {

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

@@ -166,19 +166,25 @@ object SettingsContract {
         const val WIFI_ICHNAEA = "location_wifi_mls"
         const val WIFI_MOVING = "location_wifi_moving"
         const val WIFI_LEARNING = "location_wifi_learning"
+        const val WIFI_CACHING = "location_wifi_caching"
         const val CELL_ICHNAEA = "location_cell_mls"
         const val CELL_LEARNING = "location_cell_learning"
+        const val CELL_CACHING = "location_cell_caching"
         const val GEOCODER_NOMINATIM = "location_geocoder_nominatim"
         const val ICHNAEA_ENDPOINT = "location_ichnaea_endpoint"
+        const val ONLINE_SOURCE = "location_online_source"
 
         val PROJECTION = arrayOf(
             WIFI_ICHNAEA,
             WIFI_MOVING,
             WIFI_LEARNING,
+            WIFI_CACHING,
             CELL_ICHNAEA,
             CELL_LEARNING,
+            CELL_CACHING,
             GEOCODER_NOMINATIM,
             ICHNAEA_ENDPOINT,
+            ONLINE_SOURCE,
         )
     }
 

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt

@@ -313,11 +313,14 @@ class SettingsProvider : ContentProvider() {
         when (key) {
             Location.WIFI_ICHNAEA -> getSettingsBoolean(key, hasUnifiedNlpLocationBackend("org.microg.nlp.backend.ichnaea"))
             Location.WIFI_MOVING -> getSettingsBoolean(key, hasUnifiedNlpLocationBackend("de.sorunome.unifiednlp.trains"))
-            Location.WIFI_LEARNING -> getSettingsBoolean(key, hasUnifiedNlpLocationBackend("helium314.localbackend", "org.fitchfamily.android.dejavu"))
+            Location.WIFI_LEARNING -> getSettingsBoolean(key, false)
+            Location.WIFI_CACHING -> getSettingsBoolean(key, getSettingsBoolean(Location.WIFI_LEARNING, false) == 1)
             Location.CELL_ICHNAEA -> getSettingsBoolean(key, hasUnifiedNlpLocationBackend("org.microg.nlp.backend.ichnaea"))
-            Location.CELL_LEARNING -> getSettingsBoolean(key, hasUnifiedNlpLocationBackend("helium314.localbackend", "org.fitchfamily.android.dejavu"))
+            Location.CELL_LEARNING -> getSettingsBoolean(key, true)
+            Location.CELL_CACHING -> getSettingsBoolean(key, getSettingsBoolean(Location.CELL_LEARNING, true) == 1)
             Location.GEOCODER_NOMINATIM -> getSettingsBoolean(key, hasUnifiedNlpGeocoderBackend("org.microg.nlp.backend.nominatim") )
-            Location.ICHNAEA_ENDPOINT -> getSettingsString(key, BuildConfig.ICHNAEA_ENDPOINT_DEFAULT)
+            Location.ICHNAEA_ENDPOINT -> getSettingsString(key, null)
+            Location.ONLINE_SOURCE -> getSettingsString(key, null)
             else -> throw IllegalArgumentException("Unknown key: $key")
         }
     }
@@ -337,6 +340,7 @@ class SettingsProvider : ContentProvider() {
                 Location.CELL_LEARNING -> editor.putBoolean(key, value as Boolean)
                 Location.GEOCODER_NOMINATIM -> editor.putBoolean(key, value as Boolean)
                 Location.ICHNAEA_ENDPOINT -> (value as String).let { if (it.isBlank()) editor.remove(key) else editor.putString(key, it) }
+                Location.ONLINE_SOURCE -> (value as? String?).let { if (it.isNullOrBlank()) editor.remove(key) else editor.putString(key, it) }
                 else -> throw IllegalArgumentException("Unknown key: $key")
             }
         }

play-services-base/core/src/main/res/values-ar/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="menu_advanced">إعدادات متقدمة</string>
+    <string name="list_no_item_none">لا يوجد</string>
+    <string name="list_item_see_all">عرض الكل</string>
+    <string name="open_app">فتح</string>
+    <string name="service_status_disabled">غير مفعّل</string>
+    <string name="service_status_enabled">مفعّل</string>
+    <string name="service_status_automatic">تلقائي</string>
+    <string name="service_status_manual">يدوي</string>
+    <string name="service_status_enabled_short">مفعّل</string>
+    <string name="service_status_disabled_short">غير مفعّل</string>
+    <string name="foreground_service_notification_title">نشط في الخلفية</string>
+    <string name="foreground_service_notification_big_text">استثني &lt;xliff:g example=\"microG Services\"&gt;%1$s&lt;/xliff:g&gt; من تحسينات البطارية أو غير إعدادات الإشعارات لإخفاء هذا اﻹشعار.</string>
+    <string name="foreground_service_notification_text">&lt;xliff:g example=\"Exposure Notification\"&gt;%1$s&lt;/xliff:g&gt; يعمل في الخلفية.</string>
+</resources>

play-services-base/core/src/main/res/values-az/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="foreground_service_notification_title">Arxa planda işləkdir</string>
+    <string name="foreground_service_notification_big_text">Batareya optimallaşmasından <xliff:g example="microG Services"> %1$s</xliff:g>-i çıxar və ya bu bildirişi gizlətmək üçün bildiriş seçimlərin dəyişdir.</string>
+    <string name="menu_advanced">Qabaqcıl</string>
+    <string name="list_item_see_all">Hamısın gör</string>
+    <string name="open_app">Aç</string>
+    <string name="service_status_disabled">Qeyri-aktiv</string>
+    <string name="service_status_enabled">Aktivdir</string>
+    <string name="service_status_automatic">Avtomatik</string>
+    <string name="service_status_manual">Əl ilə</string>
+    <string name="service_status_enabled_short">Aktiv</string>
+    <string name="service_status_disabled_short">Bağlı</string>
+    <string name="list_no_item_none">Heç biri</string>
+</resources>

play-services-base/core/src/main/res/values-cs/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="foreground_service_notification_title">Aktivní na pozadí</string>
+    <string name="foreground_service_notification_text"><xliff:g example="Oznámení o možném kontaktu">%1$s</xliff:g> běží na pozadí.</string>
+    <string name="foreground_service_notification_big_text">Pro skrytí tohoto oznámení vypněte optimalizaci baterie pro <xliff:g example="Služby microG">%1$s</xliff:g> nebo změňte nastavení oznámení.</string>
+    <string name="list_no_item_none">Žádné</string>
+    <string name="list_item_see_all">Zobrazit vše</string>
+    <string name="open_app">Otevřít</string>
+    <string name="service_status_disabled">Zakázáno</string>
+    <string name="service_status_enabled">Povoleno</string>
+    <string name="service_status_enabled_short">Zap</string>
+    <string name="menu_advanced">Pokročilé</string>
+    <string name="service_status_automatic">Automatické</string>
+    <string name="service_status_manual">Ruční</string>
+    <string name="service_status_disabled_short">Vyp</string>
+</resources>

play-services-base/core/src/main/res/values-ga/strings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="foreground_service_notification_title">Gníomhach sa chúlra</string>
+    <string name="menu_advanced">Casta</string>
+    <string name="service_status_enabled">Cumasaithe</string>
+    <string name="service_status_automatic">Uathoibríoch</string>
+    <string name="service_status_manual">Lámhleabhar</string>
+    <string name="foreground_service_notification_big_text">Fág <xliff:g example="MicroG Services">%1$s</xliff:g> as an mbarrfheabhsú ceallraí nó athraigh socruithe fógra chun an fógra seo a chur i bhfolach.</string>
+    <string name="list_no_item_none">Dada</string>
+    <string name="foreground_service_notification_text"><xliff:g example="Fógra Nochta">%1$s</xliff:g> ag rith sa chúlra.</string>
+    <string name="list_item_see_all">Féach ar fad</string>
+    <string name="service_status_enabled_short">Ar</string>
+    <string name="open_app">Oscail</string>
+    <string name="service_status_disabled">Faoi mhíchumas</string>
+    <string name="service_status_disabled_short">As</string>
+</resources>