From 1e12e76233e4fc7189dbf6e82e72f370398f8197 Mon Sep 17 00:00:00 2001
From: Aykhan <ayxanshikhaliyevuv@gmail.com>
Date: Thu, 10 Oct 2024 12:49:08 +0400
Subject: [PATCH] Bump GMS version to 24.38.64

---
 build.gradle                                  |   4 +-
 gradle.properties                             |   5 +-
 play-services-core/build.gradle               |   2 +
 .../src/main/res/layout/about_root.xml        |   2 +
 .../src/main/res/layout/self_check_entry.xml  |   3 -
 .../src/main/res/layout/self_check_group.xml  |   2 -
 .../src/main/res/values-in/strings.xml        |  54 +++++
 .../src/main/res/values/strings.xml           |   2 +-
 .../src/main/AndroidManifest.xml              |   4 +-
 .../microg/gms/auth/login/LoginActivity.java  |  16 +-
 .../org/microg/gms/ui/AskPushPermission.java  |  68 +++---
 .../gms/accountsettings/ui/MainActivity.kt    |   9 +-
 .../gms/accountsettings/ui/extensions.kt      |   1 +
 .../main/res/layout/ask_push_notification.xml |  88 +++-----
 .../src/main/res/layout/login_assistant.xml   |   5 +-
 .../res/layout/login_assistant_loading.xml    |   2 +-
 .../layout/preference_material_card_view.xml  |  10 +-
 .../res/layout/preference_material_switch.xml |   1 -
 .../layout/preference_material_switch_bar.xml |   1 -
 .../main/res/layout/signin_account_row.xml    |   1 -
 .../src/main/res/values-ar/strings.xml        | 210 +++++++++---------
 .../src/main/res/values-in/plurals.xml        |  28 +++
 .../src/main/res/values-in/strings.xml        | 194 ++++++++++++++++
 .../src/main/res/values-it/plurals.xml        |  31 +++
 .../src/main/res/values-it/strings.xml        | 201 +++++++++++++++++
 .../src/main/res/values-v27/themes.xml        |   2 +
 .../src/main/res/values/themes.xml            |  19 +-
 27 files changed, 726 insertions(+), 239 deletions(-)
 create mode 100644 play-services-core/microg-ui-tools/src/main/res/values-in/strings.xml
 create mode 100644 play-services-core/src/main/res/values-in/plurals.xml
 create mode 100644 play-services-core/src/main/res/values-in/strings.xml
 create mode 100644 play-services-core/src/main/res/values-it/plurals.xml
 create mode 100644 play-services-core/src/main/res/values-it/strings.xml

diff --git a/build.gradle b/build.gradle
index 25544e0..afaafe0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = "1.1"
-    ext.appVersionCode = 243136000
+    ext.appVersionName = 2.0
+    ext.appVersionCode = 243864000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName+" GMS-"+ext.baseVersion.replaceAll("\\.", "")
     ext.isReleaseVersion = false
diff --git a/gradle.properties b/gradle.properties
index 1f9fe5b..56d8420 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
-android.enableJetifier=true
-android.experimental.legacyTransform.forceNonIncremental=true
 android.nonFinalResIds=false
-android.nonTransitiveRClass=false
\ No newline at end of file
+android.nonTransitiveRClass=false
+org.gradle.configuration-cache=true
\ No newline at end of file
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 7a8aec7..2eeece8 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -23,6 +23,8 @@ dependencies {
     implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
     implementation "androidx.preference:preference-ktx:$preferenceVersion"
     implementation "androidx.webkit:webkit:$webkitVersion"
+
+    // Material Components
     implementation "com.google.android.material:material:$materialVersion"
 
     // Navigation
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
index 9c17f9a..c3d09bb 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
@@ -28,6 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:importantForAccessibility="no"
         android:src="@android:drawable/sym_def_app_icon" />
 
     <TextView
@@ -87,6 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:divider="@null"
         android:nestedScrollingEnabled="true"
         tools:listitem="@android:layout/simple_list_item_2" />
 </LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
index 57e5527..5f6f508 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
@@ -30,11 +30,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center_vertical"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
         android:orientation="vertical"
         android:baselineAligned="false"
-        android:layout_marginRight="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp">
 
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml
index 5fc454c..b068b61 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml
@@ -26,8 +26,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?attr/listPreferredItemPaddingLeft"
         android:paddingTop="16dp"
diff --git a/play-services-core/microg-ui-tools/src/main/res/values-in/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000..2b11492
--- /dev/null
+++ b/play-services-core/microg-ui-tools/src/main/res/values-in/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ 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>
+    <string name="lib_name">Alat UI MicroG</string>
+    <string name="lib_license">Lisensi Apache 2.0, Tim microG</string>
+
+    <string name="about_version_str">Versi %1$s</string>
+    <string name="about_name_version_str">%1$s %2$s</string>
+    <string name="about_default_license">Semua hak dilindungi undang-undang</string>
+
+    <string name="prefcat_setup">Pengaturan</string>
+
+    <string name="self_check_title">Pemeriksaan Mandiri</string>
+    <string name="self_check_desc">Periksa apakah sistem sudah disiapkan dengan benar untuk menggunakan MicroG</string>
+
+    <string name="self_check_cat_permissions">Izin yang diberikan</string>
+    <string name="self_check_name_permission">Izin untuk %1$s:</string>
+    <string name="self_check_resolution_permission">Sentuh di sini untuk memberikan izin. Tidak memberikan izin dapat menyebabkan aplikasi tidak berfungsi dengan baik</string>
+
+    <string name="about_root_title">Demo UI MicroG</string>
+    <string name="about_root_summary">Ringkasan</string>
+    <string name="about_root_version">Versi v0.1.0</string>
+    <string name="about_root_libraries">Library yang disertakan</string>
+
+    <string name="about_android_support_v4">Library Dukungan v4</string>
+    <string name="about_android_support_v7_appcompat">Library Dukungan appcompat v7</string>
+    <string name="about_android_support_v7_preference">Library Dukungan preferensi v7</string>
+    <string name="about_android_support_license">Lisensi Apache 2.0, Proyek Sumber Terbuka Android</string>
+
+    <!-- Updater strings-->
+
+    <string name="check_updates">Periksa pembaruan</string>
+    <string name="update_available">Versi baru tersedia!</string>
+    <string name="no_update_available">Anda sudah menggunakan versi terbaru</string>
+    <string name="check_updates_error">Tidak dapat memeriksa pembaruan</string>
+
+    <string name="error_connection">Kesalahan koneksi:</string>
+    <string name="error_others">Kesalahan:</string>
+</resources>
diff --git a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
index 3543c74..a411463 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
 
     <!-- UpdateChecker tag controller-->
 
-    <string name="github_tag_version">1.1</string>
+    <string name="github_tag_version">2.0</string>
 
     <!-- Updater strings-->
 
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index d062314..ace9d84 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -264,7 +264,7 @@
 
         <activity
             android:name="org.microg.gms.auth.login.LoginActivity"
-            android:configChanges="keyboardHidden|keyboard|screenSize"
+            android:configChanges="uiMode|keyboardHidden|keyboard|screenSize"
             android:exported="true"
             android:process=":ui"
             android:theme="@style/LoginTheme">
@@ -426,7 +426,7 @@
             android:name="org.microg.gms.ui.AskPushPermission"
             android:excludeFromRecents="true"
             android:process=":ui"
-            android:theme="@style/AppTheme.Dialog" />
+            android:theme="@style/AppThemeTransparent" />
 
         <activity
             android:name="org.microg.gms.ui.SelfCheckFragment$AsActivity"
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 2f29f1a..a68d53d 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -45,7 +45,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.StringRes;
-import androidx.preference.PreferenceManager;
 import androidx.webkit.WebSettingsCompat;
 import androidx.webkit.WebViewClientCompat;
 import androidx.webkit.WebViewFeature;
@@ -193,7 +192,6 @@ protected void onHuaweiButtonClicked() {
         super.onHuaweiButtonClicked();
         state++;
         if (state == 1) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("pref_hide_launcher_icon", false).apply();
             if (!isSpoofingEnabled(this)) {
                 LastCheckinInfo.clear(this);
                 setSpoofingEnabled(this, true);
@@ -231,19 +229,23 @@ private void init() {
         }
     }
 
+    private static boolean isSystemDarkTheme(Context context) {
+        int nightModeFlags = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;
+    }
+
     private static WebView createWebView(Context context) {
-        Context themedContext = new ContextThemeWrapper(context, R.style.LoginTheme);
+        boolean systemIsDark = isSystemDarkTheme(context);
 
-        WebView webView = new WebView(themedContext);
+        WebView webView = new WebView(context);
         webView.setVisibility(View.INVISIBLE);
         webView.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         webView.setBackgroundColor(Color.TRANSPARENT);
 
-        boolean appIsDark = (themedContext.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
-
+        // Apply dark theme to WebView based on system state
         if (Build.VERSION.SDK_INT >= 29) {
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
-                WebSettingsCompat.setForceDark(webView.getSettings(), appIsDark ? WebSettingsCompat.FORCE_DARK_ON : WebSettingsCompat.FORCE_DARK_OFF);
+                WebSettingsCompat.setForceDark(webView.getSettings(), systemIsDark ? WebSettingsCompat.FORCE_DARK_ON : WebSettingsCompat.FORCE_DARK_OFF);
             }
         }
 
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
index 6293694..122de88 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java
@@ -1,13 +1,19 @@
 package org.microg.gms.ui;
 
 import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.ResultReceiver;
+import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.SpannedString;
 import android.text.style.StyleSpan;
 import android.view.View;
 import android.widget.TextView;
@@ -18,6 +24,11 @@
 import com.google.android.gms.R;
 
 import org.microg.gms.gcm.GcmDatabase;
+import org.microg.gms.gcm.PushRegisterService;
+
+import static org.microg.gms.gcm.GcmConstants.EXTRA_APP;
+import static org.microg.gms.gcm.GcmConstants.EXTRA_KID;
+import static org.microg.gms.gcm.GcmConstants.EXTRA_PENDING_INTENT;
 
 public class AskPushPermission extends FragmentActivity {
     public static final String EXTRA_REQUESTED_PACKAGE = "package";
@@ -51,10 +62,8 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        View gcmView = getLayoutInflater().inflate(R.layout.ask_push_notification, null);
-
-        // Create and show the AlertDialog
         try {
+            View view = getLayoutInflater().inflate(R.layout.ask_push_notification, null);
             PackageManager pm = getPackageManager();
             final ApplicationInfo info = pm.getApplicationInfo(packageName, 0);
             String label = pm.getApplicationLabel(info).toString();
@@ -62,36 +71,29 @@ public void onCreate(Bundle savedInstanceState) {
             SpannableString s = new SpannableString(raw);
             s.setSpan(new StyleSpan(Typeface.BOLD), raw.indexOf(label), raw.indexOf(label) + label.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 
-            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
-            alertDialogBuilder.setCancelable(false); // Disable canceling the dialog by tapping outside or pressing the back button
-            alertDialogBuilder.setView(gcmView);
-            ((TextView) gcmView.findViewById(R.id.permission_message)).setText(s);
-            gcmView.findViewById(R.id.permission_allow_button).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (answered) return;
-                    database.noteAppKnown(packageName, true);
-                    answered = true;
-                    Bundle bundle = new Bundle();
-                    bundle.putBoolean(EXTRA_EXPLICIT, true);
-                    resultReceiver.send(Activity.RESULT_OK, bundle);
-                    finish();
-                }
-            });
-            gcmView.findViewById(R.id.permission_deny_button).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (answered) return;
-                    database.noteAppKnown(packageName, false);
-                    answered = true;
-                    Bundle bundle = new Bundle();
-                    bundle.putBoolean(EXTRA_EXPLICIT, true);
-                    resultReceiver.send(Activity.RESULT_CANCELED, bundle);
-                    finish();
-                }
-            });
-            AlertDialog alertDialog = alertDialogBuilder.create();
-            alertDialog.show();
+            ((TextView) view.findViewById(R.id.permission_message)).setText(s);
+            UtilsKt.buildAlertDialog(this)
+                    .setView(view)
+                    .setPositiveButton(R.string.allow, (dialog, which) -> {
+                        if (answered) return;
+                        database.noteAppKnown(packageName, true);
+                        answered = true;
+                        Bundle bundle = new Bundle();
+                        bundle.putBoolean(EXTRA_EXPLICIT, true);
+                        resultReceiver.send(Activity.RESULT_OK, bundle);
+                        finish();
+                    })
+                    .setNegativeButton(R.string.deny, (dialog, which) -> {
+                        if (answered) return;
+                        database.noteAppKnown(packageName, false);
+                        answered = true;
+                        Bundle bundle = new Bundle();
+                        bundle.putBoolean(EXTRA_EXPLICIT, true);
+                        resultReceiver.send(Activity.RESULT_CANCELED, bundle);
+                        finish();
+                    })
+                    .create()
+                    .show();
         } catch (PackageManager.NameNotFoundException e) {
             finish();
         }
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
index db66700..fedc4f8 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
@@ -7,7 +7,9 @@ package org.microg.gms.accountsettings.ui
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.annotation.SuppressLint
 import android.os.Bundle
+import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.webkit.WebView
@@ -35,6 +37,7 @@ private val SCREEN_ID_TO_URL = hashMapOf(
     214 to "https://myaccount.google.com/dashboard",
     215 to "https://takeout.google.com",
     216 to "https://myaccount.google.com/inactive",
+    218 to "https://myaccount.google.com/profile-picture?interop=o",
     219 to "https://myactivity.google.com/myactivity",
     220 to "https://www.google.com/maps/timeline",
     224 to "https://myactivity.google.com/activitycontrols?settings=search",
@@ -129,6 +132,8 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         val screenId = intent?.getIntExtra(EXTRA_SCREEN_ID, -1).takeIf { it != -1 } ?: ACTION_TO_SCREEN_ID[intent.action] ?: 1
+        val product = intent?.getStringExtra(EXTRA_SCREEN_MY_ACTIVITY_PRODUCT)
+
         val screenOptions = intent.extras?.keySet().orEmpty()
             .filter { it.startsWith(EXTRA_SCREEN_OPTIONS_PREFIX) }
             .map { it.substring(EXTRA_SCREEN_OPTIONS_PREFIX.length) to intent.getStringExtra(it) }
@@ -148,6 +153,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         if (screenId in SCREEN_ID_TO_URL) {
+            val screenUrl = SCREEN_ID_TO_URL[screenId]?.run { if (screenId == 547 && !product.isNullOrEmpty()) { replace("search", product) } else { this } }
             val layout = RelativeLayout(this)
             layout.addView(ProgressBar(this).apply {
                 layoutParams = RelativeLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
@@ -162,7 +168,7 @@ class MainActivity : AppCompatActivity() {
             }
             layout.addView(webView)
             setContentView(layout)
-            WebViewHelper(this, webView, ALLOWED_WEB_PREFIXES).openWebView(SCREEN_ID_TO_URL[screenId], accountName)
+            WebViewHelper(this, webView, ALLOWED_WEB_PREFIXES).openWebView(screenUrl, accountName)
             setResult(RESULT_OK)
         } else {
             Log.w(TAG, "Unknown screen id, can't open corresponding web page")
@@ -175,6 +181,7 @@ class MainActivity : AppCompatActivity() {
         super.onDestroy()
     }
 
+    @SuppressLint("MissingSuperCall")
     override fun onBackPressed() {
         if (this::webView.isInitialized && webView.canGoBack()) {
             webView.goBack()
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
index 5ca88fe..ddf9f1f 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
@@ -19,5 +19,6 @@ const val EXTRA_SCREEN_OPTIONS_PREFIX = "extra.screen."
 const val EXTRA_FALLBACK_URL = "extra.fallbackUrl"
 const val EXTRA_FALLBACK_AUTH = "extra.fallbackAuth"
 const val EXTRA_THEME_CHOICE = "extra.themeChoice"
+const val EXTRA_SCREEN_MY_ACTIVITY_PRODUCT = "extra.screen.myactivityProduct"
 
 const val OPTION_SCREEN_FLAVOR = "screenFlavor"
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/ask_push_notification.xml b/play-services-core/src/main/res/layout/ask_push_notification.xml
index dc45524..1b3ad57 100644
--- a/play-services-core/src/main/res/layout/ask_push_notification.xml
+++ b/play-services-core/src/main/res/layout/ask_push_notification.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
@@ -14,77 +15,40 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/dialog_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:orientation="vertical"
-        android:showDividers="middle">
-
-        <LinearLayout
+        android:paddingLeft="24dp"
+        android:paddingTop="18dp"
+        android:paddingRight="24dp"
+        android:paddingBottom="18dp">
+
+        <ImageView
+            android:id="@+id/permission_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginBottom="18dp"
+            android:importantForAccessibility="no"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_cloud_messaging"
+            app:tint="?attr/colorControlNormal">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/permission_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:orientation="vertical"
-            android:paddingLeft="26dp"
-            android:paddingTop="24dp"
-            android:paddingRight="26dp">
-
-            <ImageView
-                android:id="@+id/permission_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginBottom="18dp"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_cloud_messaging" />
-
-            <TextView
-                android:id="@+id/permission_message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/gcm_allow_app_popup"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textSize="20sp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="18dp"
-            android:layout_marginBottom="18dp"
-            android:divider="?attr/dividerHorizontal"
-            android:orientation="vertical"
-            android:paddingStart="26dp"
-            android:paddingEnd="26dp">
-
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/toggleButton"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:orientation="vertical">
-
-                <Button
-                    android:id="@+id/permission_allow_button"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="fill_parent"
-                    android:layout_height="72dp"
-                    android:text="@string/allow" />
-
-                <Button
-                    android:id="@+id/permission_deny_button"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="fill_parent"
-                    android:layout_height="72dp"
-                    android:text="@string/deny" />
-
-            </com.google.android.material.button.MaterialButtonToggleGroup>
-        </LinearLayout>
+            android:text="@string/gcm_allow_app_popup"
+            android:textAppearance="?attr/textAppearanceTitleMedium">
+        </TextView>
 
     </LinearLayout>
+
 </ScrollView>
diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml
index 5a00c11..907dbe7 100644
--- a/play-services-core/src/main/res/layout/login_assistant.xml
+++ b/play-services-core/src/main/res/layout/login_assistant.xml
@@ -56,8 +56,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?attr/textAppearanceDisplaySmall"
-                    android:textColor="?android:textColorPrimary"
-                    android:textStyle="bold" />
+                    android:textColor="?android:textColorPrimary" />
 
                 <FrameLayout
                     android:id="@+id/auth_content"
@@ -69,7 +68,7 @@
                         android:id="@+id/description_text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?attr/textAppearanceTitleMedium" />
+                        android:textAppearance="?android:attr/textAppearanceListItem" />
                 </FrameLayout>
 
             </LinearLayout>
diff --git a/play-services-core/src/main/res/layout/login_assistant_loading.xml b/play-services-core/src/main/res/layout/login_assistant_loading.xml
index 5fd587d..9f760d1 100644
--- a/play-services-core/src/main/res/layout/login_assistant_loading.xml
+++ b/play-services-core/src/main/res/layout/login_assistant_loading.xml
@@ -31,5 +31,5 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_marginTop="20dp"
-        android:textAppearance="?attr/textAppearanceTitleMedium" />
+        android:textAppearance="?android:attr/textAppearanceListItem" />
 </LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/preference_material_card_view.xml b/play-services-core/src/main/res/layout/preference_material_card_view.xml
index f973799..3ab0a18 100644
--- a/play-services-core/src/main/res/layout/preference_material_card_view.xml
+++ b/play-services-core/src/main/res/layout/preference_material_card_view.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="17dp">
+        android:padding="18dp">
 
         <TextView
             android:id="@android:id/title"
@@ -25,8 +25,8 @@
             android:layout_gravity="start"
             android:ellipsize="marquee"
             android:maxLines="2"
-            tools:text="Title preference"
-            android:textAppearance="?attr/textAppearanceTitleMedium" />
+            android:textAppearance="?attr/textAppearanceTitleMedium"
+            tools:text="Title preference" />
 
         <TextView
             android:id="@android:id/summary"
@@ -35,8 +35,8 @@
             android:layout_gravity="start"
             android:layout_marginTop="8dp"
             android:maxLines="10"
-            tools:text="Summary preference"
             android:textAppearance="?attr/textAppearanceBodyMedium"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="Summary preference" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/preference_material_switch.xml b/play-services-core/src/main/res/layout/preference_material_switch.xml
index a806d3c..94d654f 100644
--- a/play-services-core/src/main/res/layout/preference_material_switch.xml
+++ b/play-services-core/src/main/res/layout/preference_material_switch.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
 <com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/switchWidget"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/play-services-core/src/main/res/layout/preference_material_switch_bar.xml b/play-services-core/src/main/res/layout/preference_material_switch_bar.xml
index 42131e0..bd870b9 100644
--- a/play-services-core/src/main/res/layout/preference_material_switch_bar.xml
+++ b/play-services-core/src/main/res/layout/preference_material_switch_bar.xml
@@ -5,7 +5,6 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/play-services-core/src/main/res/layout/signin_account_row.xml b/play-services-core/src/main/res/layout/signin_account_row.xml
index ece3c23..1cbee57 100644
--- a/play-services-core/src/main/res/layout/signin_account_row.xml
+++ b/play-services-core/src/main/res/layout/signin_account_row.xml
@@ -6,7 +6,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/play-services-core/src/main/res/values-ar/strings.xml b/play-services-core/src/main/res/values-ar/strings.xml
index 1c5f706..e99323c 100644
--- a/play-services-core/src/main/res/values-ar/strings.xml
+++ b/play-services-core/src/main/res/values-ar/strings.xml
@@ -89,109 +89,109 @@
 
     <!-- Settings strings -->
 
-<string name="prefcat_about">حول</string>
-
-<string name="cond_gcm_bat_title">تمكين تحسينات البطارية</string>
-<string name="cond_gcm_bat_summary">لقد قمت بتمكين الرسائل السحابية ولكن لديك تحسينات البطارية مفعلة لخدمات MicroG. لتلقي الإشعارات يجب عليك تجاهل تحسينات البطارية</string>
-<string name="cond_gcm_bat_action">تجاهل التحسينات</string>
-<string name="cond_perm_title">إذن مفقود</string>
-
-<string name="pref_auth_trust_google_title">الثقة في Google لتصاريح التطبيقات</string>
-<string name="pref_auth_trust_google_summary">عند تعطيله، يُطلب من المستخدم قبل إرسال طلب التطبيق إلى Google. بعض التطبيقات ستفشل في استخدام حساب Google إذا تم تعطيله</string>
-<string name="pref_auth_visible_title">السماح للتطبيقات برؤية الحسابات</string>
-<string name="pref_auth_visible_summary">عند التمكين، ستتمكن جميع التطبيقات على هذا الجهاز من رؤية عنوان البريد الإلكتروني لحسابات Google الخاصة بك دون إذن مسبق</string>
-<string name="brand_spoof_button">Huawei</string>
-<string name="pref_auth_include_android_id_title">المصادقة باستخدام تسجيل الجهاز</string>
-<string name="pref_auth_include_android_id_summary">عند تعطيله، لن تكون طلبات المصادقة مرتبطة بتسجيل الجهاز، مما يسمح للأجهزة غير المصرح بها بتسجيل الدخول، ولكن قد يكون لذلك عواقب غير متوقعة</string>
-<string name="pref_auth_strip_device_name_title">إخفاء اسم الجهاز عند المصادقة</string>
-<string name="pref_auth_strip_device_name_summary">عند التمكين، لن تتضمن طلبات المصادقة اسم الجهاز، مما قد يسمح للأجهزة غير المصرح بها بتسجيل الدخول، ولكن قد يكون لذلك عواقب غير متوقعة</string>
-
-<string name="pref_checkin_enable_summary">يقوم بتسجيل جهازك في خدمات Google وينشئ معرف جهاز فريد. يقوم MicroG بإزالة الأجزاء التي تعرف الهوية باستثناء اسم حساب Google الخاص بك من بيانات التسجيل</string>
-<string name="pref_device_registration_android_id">معرف Android</string>
-
-<string name="checkin_not_registered">غير مسجل</string>
-<string name="checkin_last_registration">آخر تسجيل: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
-<string name="checkin_enable_switch">تسجيل الجهاز</string>
-
-<string name="pref_info_status">الحالة</string>
-
-<string name="pref_account_title">الحسابات</string>
-<string name="pref_account_summary">تسجيل الدخول بحساب Google جديد</string>
-<string name="pref_gcm_enable_mcs_summary">الرسائل السحابية هي موفر إشعارات الدفع المستخدم للتطبيقات المعدلة. لاستخدامه يجب تمكين تسجيل الجهاز</string>
-<string name="pref_gcm_confirm_new_apps_title">تأكيد التطبيقات الجديدة</string>
-<string name="pref_gcm_confirm_new_apps_summary">اسأل قبل تسجيل تطبيق جديد لتلقي إشعارات الدفع</string>
-
-<string name="pref_about_title">حول MicroG</string>
-
-<string name="gcm_unregister_app">إلغاء التسجيل</string>
-<string name="gcm_no_message_yet">لم يتم تلقي أي رسائل حتى الآن</string>
-<string name="gcm_last_message_at">آخر رسالة: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
-<string name="gcm_registered">مسجل</string>
-<string name="gcm_registered_since">مسجل منذ: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
-<string name="gcm_unregister_confirm_title">إلغاء تسجيل <xliff:g example="F-Droid">%1$s</xliff:g>؟</string>
-<string name="gcm_unregister_confirm_message">بعض التطبيقات لا تعيد التسجيل تلقائيًا و/أو لا توفر خيارًا للقيام بذلك يدويًا. قد لا تعمل هذه التطبيقات بشكل صحيح بعد إلغاء التسجيل.\nهل تريد المتابعة؟</string>
-<string name="gcm_unregister_after_deny_message">لقد رفضت لتطبيق التسجيل لإشعارات الدفع التي تم تسجيلها بالفعل.\nهل تريد إلغاء تسجيله الآن حتى لا يتلقى رسائل الدفع في المستقبل؟</string>
-<string name="gcm_messages_counter">الرسائل: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> بايت)</string>
-<string name="gcm_network_state_disconnected">غير متصل</string>
-<string name="gcm_network_state_connected">متصل منذ <xliff:g example="2 hours ago">%1$s</xliff:g></string>
-<string name="gcm_enable_switch">تلقي إشعارات الدفع</string>
-<string name="gcm_allow_app_popup">السماح لـ <xliff:g example="F-Droid">%1$s</xliff:g> بالتسجيل لإشعارات الدفع؟</string>
-
-<string name="pref_push_app_allow_register_title">السماح بالتسجيل</string>
-<string name="pref_push_app_allow_register_summary">السماح للتطبيق بالتسجيل لإشعارات الدفع</string>
-<string name="pref_push_app_wake_for_delivery_title">تشغيل التطبيق عند تلقي الرسائل</string>
-<string name="pref_push_app_wake_for_delivery_summary">تشغيل التطبيق أثناء وجوده في الخلفية لتلقي رسائل الدفع الواردة</string>
-<string name="prefcat_push_apps_title">التطبيقات التي تستخدم إشعارات الدفع</string>
-<string name="prefcat_push_apps_registered_title">التطبيقات المسجلة</string>
-<string name="prefcat_push_apps_unregistered_title">التطبيقات غير المسجلة</string>
-<string name="prefcat_push_networks_title">الشبكات المستخدمة لإشعارات الدفع</string>
-
-<string name="profile_name_native">أصلي</string>
-<string name="profile_name_real">حقيقي</string>
-<string name="profile_name_user">مخصص: %s</string>
-<string name="profile_name_auto">تلقائي: %s</string>
-<string name="profile_name_system">نظام: %s</string>
-<string name="pref_device_registration_import_custom_profile_title">استيراد ملف تعريف مخصص</string>
-<string name="pref_device_registration_serial_title">سيريال</string>
-<string name="pref_device_registration_import_custom_profile_summary">استيراد ملف تعريف الجهاز من الملف</string>
-<string name="pref_device_registration_select_profile_title">اختر ملف تعريف</string>
-<string name="pref_device_registration_device_profile_category">ملف تعريف الجهاز</string>
-
-<string name="push_notifications_summary_off">إيقاف</string>
-<string name="push_notifications_summary_automatic">تشغيل / تلقائي: %s</string>
-<string name="push_notifications_summary_manual">تشغيل / يدوي: %s</string>
-<string name="push_notifications_summary_values_seconds">%s ثواني</string>
-<string name="push_notifications_summary_values_minutes">%s دقائق</string>
-
-<string name="pref_network_google_enabled_summary">إذا تم تعطيله، سيتم رفض جميع الاتصالات بخوادم Google التي تتم عادةً بواسطة MicroG. هذا يتجاوز إعدادات الخدمة المحددة</string>
-<string name="pref_network_google_enabled">السماح بالاتصال بخوادم Google</string>
-<string name="pref_network_google_use_tor">الاتصال بـ Google عبر شبكة Tor</string>
-<string name="pref_network_google_use_tor_summary">يتطلب تثبيت Orbot\nغير مدعوم حتى الآن</string>
-
-<!-- Account settings-->
-
-<string name="pref_accounts_summary">إضافة وإدارة حسابات Google</string>
-<string name="prefcat_accounts_options_title">خيارات</string>
-<string name="prefcat_accounts_login_accounts_title">تسجيل الدخول</string>
-<string name="pref_accounts_add_account_title">إضافة حساب</string>
-<string name="pref_accounts_manage_accounts_title">إدارة الحسابات</string>
-<string name="pref_accounts_manage_accounts_summary">افتح مدير حسابات الجهاز</string>
-<!-- YouTube activity-->
-<string name="prefcat_youtube_activity">نشاط YouTube</string>
-<string name="pref_manage_all_history">إدارة كل السجل</string>
-<string name="pref_data_in_youtube">بياناتك في YouTube</string>
-
-<!-- Account remove dialog-->
-
-<string name="dialog_title_remove_account">إزالة الحساب</string>
-<string name="dialog_message_remove_account">هل أنت متأكد أنك تريد إزالة هذا الحساب؟\n\nبعض الخدمات والوظائف ستكون غير متاحة\n\nلن تُفقد بياناتك</string>
-<string name="dialog_confirm_button">إزالة</string>
-<string name="dialog_cancel_button">إلغاء</string>
-<string name="toast_remove_account_success">تمت إزالة %s</string>
-
-<!-- Settings options strings-->
-
-<string name="developer">المطور</string>
-<string name="github_source">مستودع الشيفرة المصدرية</string>
-<string name="pref_hide_launcher_icon">إخفاء الأيقونة في المشغل</string>
+    <string name="prefcat_about">حول</string>
+
+    <string name="cond_gcm_bat_title">تمكين تحسينات البطارية</string>
+    <string name="cond_gcm_bat_summary">لقد قمت بتمكين الرسائل السحابية ولكن لديك تحسينات البطارية مفعلة لخدمات MicroG. لتلقي الإشعارات يجب عليك تجاهل تحسينات البطارية</string>
+    <string name="cond_gcm_bat_action">تجاهل التحسينات</string>
+    <string name="cond_perm_title">إذن مفقود</string>
+
+    <string name="pref_auth_trust_google_title">الثقة في Google لتصاريح التطبيقات</string>
+    <string name="pref_auth_trust_google_summary">عند تعطيله، يُطلب من المستخدم قبل إرسال طلب التطبيق إلى Google. بعض التطبيقات ستفشل في استخدام حساب Google إذا تم تعطيله</string>
+    <string name="pref_auth_visible_title">السماح للتطبيقات برؤية الحسابات</string>
+    <string name="pref_auth_visible_summary">عند التمكين، ستتمكن جميع التطبيقات على هذا الجهاز من رؤية عنوان البريد الإلكتروني لحسابات Google الخاصة بك دون إذن مسبق</string>
+    <string name="brand_spoof_button">Huawei</string>
+    <string name="pref_auth_include_android_id_title">المصادقة باستخدام تسجيل الجهاز</string>
+    <string name="pref_auth_include_android_id_summary">عند تعطيله، لن تكون طلبات المصادقة مرتبطة بتسجيل الجهاز، مما يسمح للأجهزة غير المصرح بها بتسجيل الدخول، ولكن قد يكون لذلك عواقب غير متوقعة</string>
+    <string name="pref_auth_strip_device_name_title">إخفاء اسم الجهاز عند المصادقة</string>
+    <string name="pref_auth_strip_device_name_summary">عند التمكين، لن تتضمن طلبات المصادقة اسم الجهاز، مما قد يسمح للأجهزة غير المصرح بها بتسجيل الدخول، ولكن قد يكون لذلك عواقب غير متوقعة</string>
+
+    <string name="pref_checkin_enable_summary">يقوم بتسجيل جهازك في خدمات Google وينشئ معرف جهاز فريد. يقوم MicroG بإزالة الأجزاء التي تعرف الهوية باستثناء اسم حساب Google الخاص بك من بيانات التسجيل</string>
+    <string name="pref_device_registration_android_id">معرف Android</string>
+
+    <string name="checkin_not_registered">غير مسجل</string>
+    <string name="checkin_last_registration">آخر تسجيل: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="checkin_enable_switch">تسجيل الجهاز</string>
+
+    <string name="pref_info_status">الحالة</string>
+
+    <string name="pref_account_title">الحسابات</string>
+    <string name="pref_account_summary">تسجيل الدخول بحساب Google جديد</string>
+    <string name="pref_gcm_enable_mcs_summary">الرسائل السحابية هي موفر إشعارات الدفع المستخدم للتطبيقات المعدلة. لاستخدامه يجب تمكين تسجيل الجهاز</string>
+    <string name="pref_gcm_confirm_new_apps_title">تأكيد التطبيقات الجديدة</string>
+    <string name="pref_gcm_confirm_new_apps_summary">اسأل قبل تسجيل تطبيق جديد لتلقي إشعارات الدفع</string>
+
+    <string name="pref_about_title">حول MicroG</string>
+
+    <string name="gcm_unregister_app">إلغاء التسجيل</string>
+    <string name="gcm_no_message_yet">لم يتم تلقي أي رسائل حتى الآن</string>
+    <string name="gcm_last_message_at">آخر رسالة: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_registered">مسجل</string>
+    <string name="gcm_registered_since">مسجل منذ: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_unregister_confirm_title">إلغاء تسجيل <xliff:g example="F-Droid">%1$s</xliff:g>؟</string>
+    <string name="gcm_unregister_confirm_message">بعض التطبيقات لا تعيد التسجيل تلقائيًا و/أو لا توفر خيارًا للقيام بذلك يدويًا. قد لا تعمل هذه التطبيقات بشكل صحيح بعد إلغاء التسجيل.\nهل تريد المتابعة؟</string>
+    <string name="gcm_unregister_after_deny_message">لقد رفضت لتطبيق التسجيل لإشعارات الدفع التي تم تسجيلها بالفعل.\nهل تريد إلغاء تسجيله الآن حتى لا يتلقى رسائل الدفع في المستقبل؟</string>
+    <string name="gcm_messages_counter">الرسائل: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> بايت)</string>
+    <string name="gcm_network_state_disconnected">غير متصل</string>
+    <string name="gcm_network_state_connected">متصل منذ <xliff:g example="2 hours ago">%1$s</xliff:g></string>
+    <string name="gcm_enable_switch">تلقي إشعارات الدفع</string>
+    <string name="gcm_allow_app_popup">السماح لـ <xliff:g example="F-Droid">%1$s</xliff:g> بالتسجيل لإشعارات الدفع؟</string>
+
+    <string name="pref_push_app_allow_register_title">السماح بالتسجيل</string>
+    <string name="pref_push_app_allow_register_summary">السماح للتطبيق بالتسجيل لإشعارات الدفع</string>
+    <string name="pref_push_app_wake_for_delivery_title">تشغيل التطبيق عند تلقي الرسائل</string>
+    <string name="pref_push_app_wake_for_delivery_summary">تشغيل التطبيق أثناء وجوده في الخلفية لتلقي رسائل الدفع الواردة</string>
+    <string name="prefcat_push_apps_title">التطبيقات التي تستخدم إشعارات الدفع</string>
+    <string name="prefcat_push_apps_registered_title">التطبيقات المسجلة</string>
+    <string name="prefcat_push_apps_unregistered_title">التطبيقات غير المسجلة</string>
+    <string name="prefcat_push_networks_title">الشبكات المستخدمة لإشعارات الدفع</string>
+
+    <string name="profile_name_native">أصلي</string>
+    <string name="profile_name_real">حقيقي</string>
+    <string name="profile_name_user">مخصص: %s</string>
+    <string name="profile_name_auto">تلقائي: %s</string>
+    <string name="profile_name_system">نظام: %s</string>
+    <string name="pref_device_registration_import_custom_profile_title">استيراد ملف تعريف مخصص</string>
+    <string name="pref_device_registration_serial_title">سيريال</string>
+    <string name="pref_device_registration_import_custom_profile_summary">استيراد ملف تعريف الجهاز من الملف</string>
+    <string name="pref_device_registration_select_profile_title">اختر ملف تعريف</string>
+    <string name="pref_device_registration_device_profile_category">ملف تعريف الجهاز</string>
+
+    <string name="push_notifications_summary_off">إيقاف</string>
+    <string name="push_notifications_summary_automatic">تشغيل / تلقائي: %s</string>
+    <string name="push_notifications_summary_manual">تشغيل / يدوي: %s</string>
+    <string name="push_notifications_summary_values_seconds">%s ثواني</string>
+    <string name="push_notifications_summary_values_minutes">%s دقائق</string>
+
+    <string name="pref_network_google_enabled_summary">إذا تم تعطيله، سيتم رفض جميع الاتصالات بخوادم Google التي تتم عادةً بواسطة MicroG. هذا يتجاوز إعدادات الخدمة المحددة</string>
+    <string name="pref_network_google_enabled">السماح بالاتصال بخوادم Google</string>
+    <string name="pref_network_google_use_tor">الاتصال بـ Google عبر شبكة Tor</string>
+    <string name="pref_network_google_use_tor_summary">يتطلب تثبيت Orbot\nغير مدعوم حتى الآن</string>
+
+    <!-- Account settings-->
+
+    <string name="pref_accounts_summary">إضافة وإدارة حسابات Google</string>
+    <string name="prefcat_accounts_options_title">خيارات</string>
+    <string name="prefcat_accounts_login_accounts_title">تسجيل الدخول</string>
+    <string name="pref_accounts_add_account_title">إضافة حساب</string>
+    <string name="pref_accounts_manage_accounts_title">إدارة الحسابات</string>
+    <string name="pref_accounts_manage_accounts_summary">افتح مدير حسابات الجهاز</string>
+    <!-- YouTube activity-->
+    <string name="prefcat_youtube_activity">نشاط YouTube</string>
+    <string name="pref_manage_all_history">إدارة كل السجل</string>
+    <string name="pref_data_in_youtube">بياناتك في YouTube</string>
+
+    <!-- Account remove dialog-->
+
+    <string name="dialog_title_remove_account">إزالة الحساب</string>
+    <string name="dialog_message_remove_account">هل أنت متأكد أنك تريد إزالة هذا الحساب؟\n\nبعض الخدمات والوظائف ستكون غير متاحة\n\nلن تُفقد بياناتك</string>
+    <string name="dialog_confirm_button">إزالة</string>
+    <string name="dialog_cancel_button">إلغاء</string>
+    <string name="toast_remove_account_success">تمت إزالة %s</string>
+
+    <!-- Settings options strings-->
+
+    <string name="developer">المطور</string>
+    <string name="github_source">مستودع الشيفرة المصدرية</string>
+    <string name="pref_hide_launcher_icon">إخفاء الأيقونة في المشغل</string>
 </resources>
diff --git a/play-services-core/src/main/res/values-in/plurals.xml b/play-services-core/src/main/res/values-in/plurals.xml
new file mode 100644
index 0000000..163b3ae
--- /dev/null
+++ b/play-services-core/src/main/res/values-in/plurals.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ 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">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> Aplikasi terdaftar</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="other">Beberapa izin yang diperlukan untuk fungsionalitas yang tepat dari Layanan microG belum diberikan.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="other">Minta izin yang hilang</item>
+    </plurals>
+</resources>
diff --git a/play-services-core/src/main/res/values-in/strings.xml b/play-services-core/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000..3cd1faf
--- /dev/null
+++ b/play-services-core/src/main/res/values-in/strings.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2017 MicroG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="gms_settings_name">Pengaturan MicroG</string>
+    <string name="gms_settings_summary">Atur layanan MicroG</string>
+
+    <string name="just_a_sec">Tunggu sebentar…</string>
+    <string name="ask_permission_tos">Dengan melanjutkan, Anda mengizinkan aplikasi ini dan Google untuk menggunakan informasi Anda sesuai dengan ketentuan layanan dan kebijakan privasi masing-masing</string>
+    <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> ingin:</string>
+    <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> ingin menggunakan:</string>
+
+    <string name="pref_privacy_title">Privasi</string>
+    <string name="pref_privacy_summary">Pengaturan privasi untuk otentikasi dan aplikasi</string>
+    <string name="prefcat_applications">Aplikasi</string>
+    <string name="prefcat_authentication">Otentikasi</string>
+
+    <string name="sorry">Maaf…</string>
+    <string name="auth_before_connect">"Hubungkan akun Google dengan MicroG.
+
+Mari hubungkan dengan akun Google, gunakan tombol <b>Masuk</b> atau gunakan tombol <b>Huawei</b> jika Anda memiliki perangkat dengan produsen ini. Dengan menekan salah satu tombol Anda akan diarahkan ke halaman untuk masuk ke akun Anda."</string>
+    <string name="auth_sign_in">Masuk</string>
+    <string name="auth_connecting">"Perangkat Anda sedang menghubungkan ke server Google untuk masuk ke akun Anda.
+
+Ini mungkin memerlukan beberapa detik"</string>
+    <string name="no_network_error_desc">"Anda tidak memiliki koneksi jaringan.
+
+Ini bisa menjadi masalah sementara atau perangkat Android Anda mungkin tidak terdaftar untuk layanan data. Coba lagi saat terhubung ke jaringan seluler, atau hubungkan ke jaringan Wi-Fi"</string>
+    <string name="auth_general_error_desc">"Terjadi masalah dalam berkomunikasi dengan server Google.
+
+Coba lagi nanti"</string>
+    <string name="auth_finalize">"Perangkat Anda sedang menghubungi Google untuk menyimpan informasi ke akun Anda.
+
+Ini mungkin memerlukan beberapa menit"</string>
+    <string name="allow">Izinkan</string>
+    <string name="deny">Tolak</string>
+    <string name="auth_notification_title">Otentikasi diperlukan</string>
+    <string name="auth_notification_content"><xliff:g example="F-Droid">%1$s</xliff:g> memerlukan otorisasi Anda untuk mengakses akun Google Anda</string>
+
+    <string name="signin_picker_title">Pilih akun</string>
+    <string name="signin_picker_subtitle">untuk melanjutkan ke <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="signin_picker_add_account_label">Tambahkan akun lain</string>
+    <string name="signin_confirm_title">Izinkan untuk masuk ke <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="signin_confirm_button_text">Izinkan dan bagikan</string>
+    <string name="signin_subtext_sharing">Untuk melanjutkan, MicroG akan membagikan nama, alamat email, dan foto profil dari akun Google Anda dengan <xliff:g example="F-Droid">%1$s</xliff:g></string>
+
+    <string name="perm_status_broadcast_label">dengarkan siaran status internal</string>
+    <string name="perm_gsf_read_gservices_label">baca konfigurasi layanan Google</string>
+    <string name="perm_c2dm_receive_label">dengarkan pesan C2DM</string>
+    <string name="perm_c2dm_send_label">kirim pesan C2DM ke aplikasi lain</string>
+    <string name="perm_gtalk_svc_label">tukar pesan dan terima notifikasi sinkronisasi dari server Google</string>
+    <string name="perm_extended_access_label">Akses diperluas ke layanan Google</string>
+
+    <string name="service_name_checkin">Registrasi perangkat</string>
+    <string name="service_name_mcs">Pesan Awan</string>
+
+    <string name="network_type_mobile">Jaringan seluler</string>
+    <string name="network_type_other">Jaringan lainnya</string>
+
+    <!-- Self check -->
+
+    <string name="self_check_cat_fake_sig">Dukungan pemalsuan tanda tangan</string>
+    <string name="self_check_cat_gms_packages">Paket yang terinstal</string>
+    <string name="self_check_cat_system">Sistem</string>
+
+    <string name="self_check_name_fake_sig_perm">Sistem memiliki dukungan pemalsuan tanda tangan</string>
+    <string name="self_check_resolution_fake_sig_perm">ROM Anda tidak memiliki dukungan asli untuk pemalsuan tanda tangan. Anda masih dapat menggunakan Xposed atau sistem lain untuk memalsukan tanda tangan. Silakan periksa dokumentasi tentang ROM mana yang mendukung pemalsuan tanda tangan dan cara menggunakan MicroG pada ROM yang tidak mendukung</string>
+    <string name="self_check_name_perm_granted">Sistem memberikan izin pemalsuan tanda tangan</string>
+    <string name="self_check_resolution_perm_granted">Ini adalah indikasi kuat bahwa ROM mendukung pemalsuan tanda tangan, tetapi memerlukan tindakan lebih lanjut untuk mengaktifkannya. Silakan periksa dokumentasi tentang langkah-langkah yang mungkin diperlukan</string>
+    <string name="self_check_name_system_spoofs">Sistem memalsukan tanda tangan</string>
+    <string name="self_check_resolution_system_spoofs">Silakan periksa dokumentasi tentang langkah-langkah yang mungkin diperlukan</string>
+
+    <string name="self_check_pkg_gms">Layanan Play</string>
+    <string name="self_check_name_app_installed"><xliff:g example="F-Droid">%1$s</xliff:g> terinstal</string>
+    <string name="self_check_resolution_app_installed">Instal aplikasi <xliff:g example="F-Droid">%1$s</xliff:g> atau yang kompatibel. Silakan periksa dokumentasi tentang aplikasi mana yang kompatibel</string>
+    <string name="self_check_name_correct_sig"><xliff:g example="F-Droid">%1$s</xliff:g> tanda tangan yang benar</string>
+    <string name="self_check_resolution_correct_sig">Entah <xliff:g example="F-Droid">%1$s</xliff:g> yang terinstal tidak kompatibel atau pemalsuan tanda tangan tidak aktif untuknya. Silakan periksa dokumentasi tentang aplikasi dan ROM mana yang kompatibel</string>
+
+    <string name="self_check_name_battery_optimizations">Optimasi baterai diabaikan</string>
+    <string name="self_check_resolution_battery_optimizations">Ketuk di sini untuk menonaktifkan optimasi baterai. Tidak melakukannya dapat menyebabkan masalah dalam menerima notifikasi dari YouTube dan aplikasi terdaftar lainnya</string>
+
+    <string name="self_check_revanced_name_app_installed">Berjalan dengan <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="self_check_revanced_resolution_app_installed">Aplikasi <xliff:g example="F-Droid">%1$s</xliff:g> tidak ditemukan, kompilasi atau instal apk yang dimodifikasi</string>
+
+    <!-- Settings strings -->
+
+    <string name="prefcat_about">Tentang</string>
+
+    <string name="cond_gcm_bat_title">Optimasi baterai diaktifkan</string>
+    <string name="cond_gcm_bat_summary">Anda mengaktifkan Pesan Awan tetapi memiliki optimasi baterai yang aktif untuk Layanan MicroG. Agar notifikasi push diterima, Anda harus mengabaikan optimasi baterai</string>
+    <string name="cond_gcm_bat_action">Abaikan optimasi</string>
+    <string name="cond_perm_title">Izin hilang</string>
+
+    <string name="pref_auth_trust_google_title">Percayai Google untuk izin aplikasi</string>
+    <string name="pref_auth_trust_google_summary">Jika dinonaktifkan, pengguna akan diminta sebelum permintaan otorisasi aplikasi dikirim ke Google. Beberapa aplikasi tidak akan bisa menggunakan akun Google jika ini dinonaktifkan</string>
+    <string name="pref_auth_visible_title">Izinkan aplikasi untuk menemukan akun</string>
+    <string name="pref_auth_visible_summary">Jika diaktifkan, semua aplikasi di perangkat ini akan dapat melihat alamat email akun Google Anda tanpa otorisasi sebelumnya</string>
+    <string name="brand_spoof_button">Huawei</string>
+    <string name="pref_auth_include_android_id_title">Otentikasi dengan registrasi perangkat</string>
+    <string name="pref_auth_include_android_id_summary">Jika dinonaktifkan, permintaan otentikasi tidak akan terhubung dengan registrasi perangkat, yang memungkinkan perangkat tidak sah untuk masuk, tetapi mungkin memiliki konsekuensi yang tidak terduga</string>
+    <string name="pref_auth_strip_device_name_title">Hilangkan nama perangkat untuk otentikasi</string>
+    <string name="pref_auth_strip_device_name_summary">Jika diaktifkan, permintaan otentikasi tidak akan menyertakan nama perangkat, yang mungkin memungkinkan perangkat tidak sah untuk masuk, tetapi mungkin memiliki konsekuensi yang tidak terduga</string>
+
+    <string name="pref_checkin_enable_summary">Mendaftarkan perangkat Anda ke layanan Google dan membuat pengenal perangkat unik. MicroG menghilangkan bit identifikasi selain dari nama akun Google Anda dari data registrasi</string>
+    <string name="pref_device_registration_android_id">ID Android</string>
+
+    <string name="checkin_not_registered">Belum terdaftar</string>
+    <string name="checkin_last_registration">Registrasi terakhir: <xliff:g example="Kemarin, 02:20 PM">%1$s</xliff:g></string>
+    <string name="checkin_enable_switch">Daftarkan perangkat</string>
+
+    <string name="pref_info_status">Status</string>
+
+    <string name="pref_account_title">Akun</string>
+    <string name="pref_account_summary">Masuk dengan akun Google baru</string>
+    <string name="pref_gcm_enable_mcs_summary">Cloud Messaging adalah penyedia notifikasi push yang digunakan untuk aplikasi yang dimodifikasi. Untuk menggunakannya, Anda harus mengaktifkan registrasi perangkat</string>
+    <string name="pref_gcm_confirm_new_apps_title">Konfirmasi aplikasi baru</string>
+    <string name="pref_gcm_confirm_new_apps_summary">Tanya sebelum mendaftarkan aplikasi baru untuk menerima notifikasi push</string>
+
+    <string name="pref_about_title">Tentang MicroG</string>
+
+    <string name="gcm_unregister_app">Batalkan pendaftaran</string>
+    <string name="gcm_no_message_yet">Belum ada pesan yang diterima sejauh ini</string>
+    <string name="gcm_last_message_at">Pesan terakhir: <xliff:g example="Kemarin, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_registered">Terdaftar</string>
+    <string name="gcm_registered_since">Terdaftar sejak: <xliff:g example="Kemarin, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_unregister_confirm_title">Batalkan pendaftaran <xliff:g example="F-Droid">%1$s</xliff:g>?</string>
+    <string name="gcm_unregister_confirm_message">Beberapa aplikasi tidak secara otomatis mendaftar ulang dan/atau tidak menyediakan opsi untuk melakukannya secara manual. Aplikasi ini mungkin tidak berfungsi dengan benar setelah pendaftaran dibatalkan.\nLanjutkan?</string>
+    <string name="gcm_unregister_after_deny_message">Anda menolak aplikasi untuk mendaftar menerima notifikasi push yang sudah terdaftar.\nApakah Anda ingin membatalkan pendaftarannya sekarang agar tidak menerima pesan push di masa depan?</string>
+    <string name="gcm_messages_counter">Pesan: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> byte)</string>
+    <string name="gcm_network_state_disconnected">Terputus</string>
+    <string name="gcm_network_state_connected">Terhubung sejak <xliff:g example="2 jam yang lalu">%1$s</xliff:g></string>
+    <string name="gcm_enable_switch">Terima notifikasi push</string>
+    <string name="gcm_allow_app_popup">Izinkan <xliff:g example="F-Droid">%1$s</xliff:g> untuk mendaftar menerima notifikasi push?</string>
+
+    <string name="pref_push_app_allow_register_title">Izinkan pendaftaran</string>
+    <string name="pref_push_app_allow_register_summary">Izinkan aplikasi untuk mendaftar menerima notifikasi push</string>
+    <string name="pref_push_app_wake_for_delivery_title">Mulai aplikasi pada pesan push</string>
+    <string name="pref_push_app_wake_for_delivery_summary">Mulai aplikasi saat di latar belakang untuk menerima pesan push yang masuk</string>
+    <string name="prefcat_push_apps_title">Aplikasi yang menggunakan notifikasi push</string>
+    <string name="prefcat_push_apps_registered_title">Aplikasi yang terdaftar</string>
+    <string name="prefcat_push_apps_unregistered_title">Aplikasi yang tidak terdaftar</string>
+    <string name="prefcat_push_networks_title">Jaringan yang digunakan untuk notifikasi push</string>
+
+    <string name="profile_name_native">Asli</string>
+    <string name="profile_name_real">Nyata</string>
+    <string name="profile_name_user">Kustom: %s</string>
+    <string name="profile_name_auto">Otomatis: %s</string>
+    <string name="profile_name_system">Sistem: %s</string>
+    <string name="pref_device_registration_import_custom_profile_title">Impor profil kustom</string>
+    <string name="pref_device_registration_serial_title">Serial</string>
+    <string name="pref_device_registration_import_custom_profile_summary">Impor profil perangkat dari file</string>
+    <string name="pref_device_registration_select_profile_title">Pilih profil</string>
+    <string name="pref_device_registration_device_profile_category">Profil perangkat</string>
+
+    <string name="push_notifications_summary_off">MATI</string>
+    <string name="push_notifications_summary_automatic">AKTIF / Otomatis: %s</string>
+    <string name="push_notifications_summary_manual">AKTIF / Manual: %s</string>
+    <string name="push_notifications_summary_values_seconds">%s detik</string>
+    <string name="push_notifications_summary_values_minutes">%s menit</string>
+
+    <string name="pref_network_google_enabled_summary">Jika dinonaktifkan, semua koneksi ke server Google yang biasanya dilakukan oleh MicroG akan ditolak. Ini akan menimpa pengaturan layanan tertentu</string>
+    <string name="pref_network_google_enabled">Izinkan koneksi ke server Google</string>
+    <string name="pref_network_google_use_tor">Hubungkan ke Google melalui jaringan Tor</string>
+    <string name="pref_network_google_use_tor_summary">Membutuhkan Orbot untuk diinstal\nBelum didukung</string>
+
+    <!-- Account settings-->
+
+    <string name="pref_accounts_summary">Tambahkan dan kelola akun Google</string>
+    <string name="prefcat_accounts_options_title">Opsi</string>
+    <string name="prefcat_accounts_login_accounts_title">Masuk</string>
+    <string name="pref_accounts_add_account_title">Tambahkan akun</string>
+    <string name="pref_accounts_manage_accounts_title">Kelola akun</string>
+    <string name="pref_accounts_manage_accounts_summary">Buka manajer akun perangkat</string>
+    <!-- YouTube activity-->
+    <string name="prefcat_youtube_activity">Aktivitas YouTube</string>
+    <string name="pref_manage_all_history">Kelola semua riwayat</string>
+    <string name="pref_data_in_youtube">Data Anda di YouTube</string>
+
+    <!-- Account remove dialog-->
+
+    <string name="dialog_title_remove_account">Hapus akun</string>
+    <string name="dialog_message_remove_account">Apakah Anda yakin ingin menghapus akun ini?\n\nBeberapa layanan dan fungsi akan tidak tersedia\n\nData Anda tidak akan hilang</string>
+    <string name="dialog_confirm_button">Hapus</string>
+    <string name="dialog_cancel_button">Batal</string>
+    <string name="toast_remove_account_success">Akun %s dihapus</string>
+
+    <!-- Settings options strings-->
+
+    <string name="developer">Pengembang</string>
+    <string name="github_source">Repositori kode sumber</string>
+    <string name="pref_hide_launcher_icon">Sembunyikan ikon di peluncur</string>
+</resources>
diff --git a/play-services-core/src/main/res/values-it/plurals.xml b/play-services-core/src/main/res/values-it/plurals.xml
new file mode 100644
index 0000000..e18c9b6
--- /dev/null
+++ b/play-services-core/src/main/res/values-it/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ 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">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> app registrata</item>
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> app registrate</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="one">Un permesso richiesto per il corretto funzionamento dei Servizi MicroG non è stato concesso.</item>
+        <item quantity="other">Dei permessi richiesti per il corretto funzionamento dei Servizi MicroG non sono stati concessi.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="one">Richiesta permesso mancante</item>
+        <item quantity="other">Richiesta permessi mancanti</item>
+    </plurals>
+</resources>
diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..a493770
--- /dev/null
+++ b/play-services-core/src/main/res/values-it/strings.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2017 MicroG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="gms_settings_name">Impostazioni di MicroG</string>
+    <string name="gms_settings_summary">Imposta i servizi di MicroG</string>
+
+    <string name="just_a_sec">Solo un secondo…</string>
+    <string name="ask_permission_tos">Procedendo, acconsentirai all\'app ed a Google di utilizzare le tue informazioni in accordo con i relativi termini di servizio e informativa sulla privacy</string>
+    <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> vorrebbe:</string>
+    <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> vorrebbe utilizzare:</string>
+
+    <string name="pref_privacy_title">Privacy</string>
+    <string name="pref_privacy_summary">Impostazioni della Privacy per l\'autenticazione e le app</string>
+    <string name="prefcat_applications">Applicazioni</string>
+    <string name="prefcat_authentication">Autenticazione</string>
+
+    <string name="sorry">Spiacente…</string>
+    <string name="auth_before_connect">"Connetti account Google con MicroG.
+
+Effettua una connessione ad un account Google, utilizzando il pulsante <b>Accedi</b> o il pulsante <b>Huawei</b> qualora tu fossi in possesso di un dispositivo di questo produttore. Premendo uno di questi pulsanti verrai reindirizzato alla pagina di accesso al tuo account."</string>
+    <string name="auth_sign_in">Accedi</string>
+    <string name="auth_connecting">"Il tuo dispositivo sta stabilendo una connessione con i server di Google per permetterti di accedere all\'account.
+
+Questa operazione potrebbe richiedere alcuni secondi"</string>
+    <string name="no_network_error_desc">"Non sei attualmente connesso alla rete.
+
+Questo potrebbe essere un problema temporaneo oppure di mancata disponibilità di un piano dati per il tuo dispositivo Android. Riprova quando sarai connesso ad una rete mobile o Wi-Fi"</string>
+    <string name="auth_general_error_desc">"C\'è stato un problema di comunicazione con i server di Google.
+
+Riprova più tardi"</string>
+    <string name="auth_finalize">"Il tuo dispositivo sta contattando Google per salvare le informazioni sul tuo account.
+
+Questo potrebbe richiedere qualche minuto"</string>
+    <string name="allow">Consenti</string>
+    <string name="deny">Nega</string>
+    <string name="auth_notification_title">Autenticazione richiesta</string>
+    <string name="auth_notification_content"><xliff:g example="F-Droid">%1$s</xliff:g> richiede la tua autorizzazione per accedere al tuo account Google</string>
+
+    <string name="signin_picker_title">Scegli un account</string>
+    <string name="signin_picker_subtitle">per procedere a <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="signin_picker_add_account_label">Aggiungi un altro account</string>
+    <string name="signin_confirm_title">Consenti l\'accesso a <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="signin_confirm_button_text">Consenti e condividi</string>
+    <string name="signin_subtext_sharing">Procedendo, MicroG condividerà il nome, l\'indirizzo email e l\'immagine di profilo del tuo account Google con <xliff:g example="F-Droid">%1$s</xliff:g></string>
+
+    <string name="perm_status_broadcast_label">ascolta lo stato interno dei broadcast</string>
+    <string name="perm_gsf_read_gservices_label">Leggi configurazione del servizio di Google</string>
+    <string name="perm_c2dm_receive_label">ascolta messaggi C2DM</string>
+    <string name="perm_c2dm_send_label">invia messaggi C2DM ad altre app</string>
+    <string name="perm_gtalk_svc_label">scambia messaggi e ricevi notifiche di sincronizzazione dai server di Google</string>
+    <string name="perm_extended_access_label">Estendi l\'accesso ai server di Google</string>
+
+    <string name="service_name_checkin">Registrazione dispositivo</string>
+    <string name="service_name_mcs">Messaggistica Cloud</string>
+
+    <string name="network_type_mobile">Rete mobile</string>
+    <string name="network_type_wifi">Wi-Fi</string>
+    <string name="network_type_roaming">Roaming</string>
+    <string name="network_type_other">Altre reti</string>
+
+    <!-- Self check -->
+
+    <string name="self_check_cat_fake_sig">Supporto alla falsificazione della firma</string>
+    <string name="self_check_cat_gms_packages">Pacchetti installati</string>
+    <string name="self_check_cat_system">Sistema</string>
+
+    <string name="self_check_name_fake_sig_perm">Il sistema supporta la falsificazione della firma</string>
+    <string name="self_check_resolution_fake_sig_perm">La tua ROM non possiede il supporto nativo alla falsificazione della firma. Puoi ancora utilizzare Xposed o un altro sistema per ottenere questa possibilità. Si prega di fare riferimento alla documentazione sulle ROM che supportano la falsificazione della firma e all\'utilizzo di MicroG su ROM che non forniscono tale supporto</string>
+    <string name="self_check_name_perm_granted">Il sistema ha il permesso per falsificare la firma</string>
+    <string name="self_check_resolution_perm_granted">Questo è un forte indicatore che la ROM supporta la falsificazione della firma, ma che richiede ulteriori azioni per poterne eseguire l\'attivazione. Si prega di fare riferimento alla documentazione sui passaggi che potrebbero essere richiesti</string>
+    <string name="self_check_name_system_spoofs">Il sistema falsifica la firma</string>
+    <string name="self_check_resolution_system_spoofs">Si prega di fare riferimento alla documentazione sui passaggi che potrebbero essere richiesti</string>
+
+    <string name="self_check_pkg_gms">Play Services</string>
+    <string name="self_check_pkg_vending">Play Store</string>
+    <string name="self_check_name_app_installed"><xliff:g example="F-Droid">%1$s</xliff:g> installata</string>
+    <string name="self_check_resolution_app_installed">Installa l\'applicazione <xliff:g example="F-Droid">%1$s</xliff:g> o una versione compatibile. Si prega di verificare la documentazione sulle app compatibili</string>
+    <string name="self_check_name_correct_sig"><xliff:g example="F-Droid">%1$s</xliff:g> è correttamente firmata</string>
+    <string name="self_check_resolution_correct_sig">L\'App <xliff:g example="F-Droid">%1$s</xliff:g> installata non è compatibile oppure la sua firma non è stata falsificata. Si prega di fare riferimento alla documentazione sulle applicazioni e le ROM compatibili</string>
+
+    <string name="self_check_name_battery_optimizations">Ottimizzazioni batteria ignorate</string>
+    <string name="self_check_resolution_battery_optimizations">Tocca qui per ignorare le ottimizzazioni della batteria. Continuare a concederle potrebbe impedire la ricezione di notifiche da YouTube o da altre app registrate</string>
+
+    <string name="self_check_pkg_revanced">ReVanced</string>
+    <string name="self_check_pkg_revanced_extended">ReVanced Extended</string>
+    <string name="self_check_pkg_youtube_advanced">YT Advanced</string>
+    <string name="self_check_pkg_vanced">Vanced</string>
+    <string name="self_check_revanced_name_app_installed">In esecuzione su <xliff:g example="F-Droid">%1$s</xliff:g></string>
+    <string name="self_check_revanced_resolution_app_installed">App <xliff:g example="F-Droid">%1$s</xliff:g> non trovata, compila o installa una versione modificata</string>
+
+    <!-- Settings strings -->
+
+    <string name="prefcat_about">Informazioni su</string>
+
+    <string name="cond_gcm_bat_title">Ottimizzazioni batteria attive</string>
+    <string name="cond_gcm_bat_summary">Hai attivato l\'opzione Messaggistica Cloud ma le ottimizzazioni della batteria per i Servizi MicroG risultano attive. Per poter ricevere le notifiche push devi ignorare le suddette ottimizzioni</string>
+    <string name="cond_gcm_bat_action">Ignora ottimizzazioni</string>
+    <string name="cond_perm_title">Permesso non concesso</string>
+
+    <string name="pref_auth_trust_google_title">Rendi Google una fonte affidabile per i permessi delle app</string>
+    <string name="pref_auth_trust_google_summary">Quando questa opzione risulta disattivata, all\'utente verrà prima chiesto se inviare la richiesta di autorizzazione di un\'app a Google o meno. Alcune applicazioni potrebbero non riuscire ad utilizzare l\'account Google in assenza di tale opzione</string>
+    <string name="pref_auth_visible_title">Consenti alle app di trovare gli account</string>
+    <string name="pref_auth_visible_summary">Quando questa opzione risulta attiva, tutte le applicazioni su questo dispositivo saranno in grado di vedere l\'indirizzo email dei tuoi Account Google senza pre-autorizzazione</string>
+    <string name="brand_spoof_button">Huawei</string>
+    <string name="pref_auth_include_android_id_title">Autentica con registrazione dispositivo</string>
+    <string name="pref_auth_include_android_id_summary">Quando questa opzione risulta disattivata, le richieste di autorizzazione non saranno legate alla funzionalità di registrazione del dispositivo, che consente a dispositivi non autorizzati di accedere, comportando eventuali conseguenze inattese</string>
+    <string name="pref_auth_strip_device_name_title">Rimuovi il nome del dispositivo dalle informazioni di autenticazione</string>
+    <string name="pref_auth_strip_device_name_summary">Quando questa opzione risulta attiva, le richieste di autenticazione non includeranno il nome del dispositivo, che potrebbe consentire a dispositivi non autorizzati di accedere, comportando eventuali conseguenze inattese</string>
+
+    <string name="pref_checkin_enable_summary">Registra il tuo dispositivo sui servizi Google e crea un identificativo univoco. MicroG rimuoverà i bit di identificazione oltre che il nome del tuo account Google dai dati di registrazione</string>
+    <string name="pref_device_registration_android_id">ID Android</string>
+
+    <string name="checkin_not_registered">Non registrato</string>
+    <string name="checkin_last_registration">Ultima registrazione: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="checkin_enable_switch">Registra dispositivo</string>
+
+    <string name="pref_info_status">Stato</string>
+
+    <string name="pref_account_title">Account</string>
+    <string name="pref_account_summary">Accedi ad un nuovo account Google</string>
+    <string name="pref_gcm_enable_mcs_summary">Messaggistica Cloud è un fornitore di notifiche push utilizzato per le app modificate. Per poter essere utilizzato è necessario attivare la registrazione del dispositivo</string>
+    <string name="pref_gcm_confirm_new_apps_title">Conferma nuove app</string>
+    <string name="pref_gcm_confirm_new_apps_summary">Chiedi prima di registrare una nuova app per la ricezione di notifiche</string>
+
+    <string name="pref_about_title">Informazioni su MicroG</string>
+
+    <string name="gcm_unregister_app">Annulla registrazione</string>
+    <string name="gcm_no_message_yet">Nessun messaggio finora ricevuto</string>
+    <string name="gcm_last_message_at">Ultimo messaggio: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_registered">Registrato</string>
+    <string name="gcm_registered_since">Registrato da: <xliff:g example="Yesterday, 02:20 PM">%1$s</xliff:g></string>
+    <string name="gcm_unregister_confirm_title">Unregister <xliff:g example="F-Droid">%1$s</xliff:g>?</string>
+    <string name="gcm_unregister_confirm_message">Alcune app non effettuano una nuova registrazione in automatico o non forniscono un\'opzione manuale per farlo. Queste app potrebbero non funzionare correttamente dopo aver annullato la registrazione.\nProcedere?</string>
+    <string name="gcm_unregister_after_deny_message">Hai negato ad un\'app già registrata di potersi registrare nuovamente per mostrare notifiche push.\nIntendi annullare anche la sua attuale registrazione ora, così da non ricevere notifiche push in futuro?</string>
+    <string name="gcm_messages_counter">Messaggi: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> byte)</string>
+    <string name="gcm_network_state_disconnected">Disconnesso</string>
+    <string name="gcm_network_state_connected">Connesso da <xliff:g example="2 hours ago">%1$s</xliff:g></string>
+    <string name="gcm_enable_switch">Ricevi notifiche push</string>
+    <string name="gcm_allow_app_popup">Vuoi consentire a <xliff:g example="F-Droid">%1$s</xliff:g> di registrarsi per mostrare notifiche push?</string>
+
+    <string name="pref_push_app_allow_register_title">Consenti registrazione</string>
+    <string name="pref_push_app_allow_register_summary">Consenti all\'app di registrarsi per mostrare notifiche push</string>
+    <string name="pref_push_app_wake_for_delivery_title">Inizializza app su notifiche push</string>
+    <string name="pref_push_app_wake_for_delivery_summary">Inizializza l\'app mentre è in secondo piano per ricevere le notifiche push in arrivo</string>
+    <string name="prefcat_push_apps_title">App che utilizzano notifiche push</string>
+    <string name="prefcat_push_apps_registered_title">App registrate</string>
+    <string name="prefcat_push_apps_unregistered_title">App non registrate</string>
+    <string name="prefcat_push_networks_title">Retiche utilizzano notifiche push</string>
+
+    <string name="profile_name_native">Nativo</string>
+    <string name="profile_name_real">Reale</string>
+    <string name="profile_name_user">Personalizzato: %s</string>
+    <string name="profile_name_auto">Automatico: %s</string>
+    <string name="profile_name_system">Sistema: %s</string>
+    <string name="pref_device_registration_import_custom_profile_title">Importa profilo personalizzato</string>
+    <string name="pref_device_registration_serial_title">Numero identificativo</string>
+    <string name="pref_device_registration_import_custom_profile_summary">Importa profilo dispositivo da file</string>
+    <string name="pref_device_registration_select_profile_title">Seleziona profilo</string>
+    <string name="pref_device_registration_device_profile_category">Profilo dispositivo</string>
+
+    <string name="push_notifications_summary_off">DISATTIVATO</string>
+    <string name="push_notifications_summary_automatic">ATTIVO / Automatico: %s</string>
+    <string name="push_notifications_summary_manual">ATTIVO / Manuale: %s</string>
+    <string name="push_notifications_summary_values_seconds">%s secondi</string>
+    <string name="push_notifications_summary_values_minutes">%s minuti</string>
+
+    <string name="pref_network_google_enabled_summary">Se l\'opzione risulta disattivata, tutte le connessioni ai server Google normalmente gestite da MicroG verranno negate. Ciò sovrascriverà le impostazioni di servizio specifiche</string>
+    <string name="pref_network_google_enabled">Consenti connessione ai server Google</string>
+    <string name="pref_network_google_use_tor">Connettiti a Google tramite rete a Tor</string>
+    <string name="pref_network_google_use_tor_summary">Richiede l\'installazione di Orbot\nNon ancora supportata</string>
+
+    <!-- Account settings-->
+
+    <string name="pref_accounts_summary">Aggiungi e gestisci account Google</string>
+    <string name="prefcat_accounts_options_title">Opzioni</string>
+    <string name="prefcat_accounts_login_accounts_title">Accesso effettuato</string>
+    <string name="pref_accounts_add_account_title">Aggiungi account</string>
+    <string name="pref_accounts_manage_accounts_title">Gestisci account</string>
+    <string name="pref_accounts_manage_accounts_summary">Apri gestore account del dispositivo</string>
+    <!-- YouTube activity-->
+    <string name="prefcat_youtube_activity">Attività di YouTube</string>
+    <string name="pref_manage_all_history">Gestisci tutta la cronologia</string>
+    <string name="pref_data_in_youtube">I tuoi dati su YouTube</string>
+
+    <!-- Account remove dialog-->
+
+    <string name="dialog_title_remove_account">Rimuovi account</string>
+    <string name="dialog_message_remove_account">Sei sicuro di voler rimuovere questo account?\n\nAlcuni servizi e funzionalità non saranno più disponibili\n\nI tuoi dati non andranno persi</string>
+    <string name="dialog_confirm_button">Rimuovi</string>
+    <string name="dialog_cancel_button">Annulla</string>
+    <string name="toast_remove_account_success">Account %s rimosso</string>
+
+    <!-- Settings options strings-->
+
+    <string name="developer">Sviluppatore</string>
+    <string name="github_source">Codice sorgente repository</string>
+    <string name="pref_hide_launcher_icon">Nascondi icona del launcher</string>
+</resources>
diff --git a/play-services-core/src/main/res/values-v27/themes.xml b/play-services-core/src/main/res/values-v27/themes.xml
index 53e34e2..b706af1 100644
--- a/play-services-core/src/main/res/values-v27/themes.xml
+++ b/play-services-core/src/main/res/values-v27/themes.xml
@@ -6,6 +6,7 @@
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
     <style name="Theme.Base.Dark">
@@ -13,5 +14,6 @@
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 </resources>
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 6c6a0f2..b52139e 100644
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -96,13 +96,9 @@
 
     <!-- Text application theme -->
 
-    <style name="Theme.TextAppearance.PreferenceTitle" parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="android:textSize">16.0sp</item>
-    </style>
+    <style name="Theme.TextAppearance.PreferenceTitle" parent="@style/TextAppearance.Material3.TitleMedium" />
 
-    <style name="Theme.TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.DeviceDefault.Medium">
-        <item name="android:textSize">14.0sp</item>
-    </style>
+    <style name="Theme.TextAppearance.CategoryTitle" parent="@style/TextAppearance.Material3.LabelLarge" />
 
     <style name="Theme.PositiveButton.Warning" parent="Widget.Material3.Button.TextButton.Dialog">
         <item name="android:textColor">?colorError</item>
@@ -113,6 +109,17 @@
 
     <style name="AppTheme" parent="AppThemeBase" />
 
+    <style name="AppThemeTransparent" parent="AppThemeBase">
+        <item name="background">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+    </style>
+
     <style name="LoginTheme" parent="AppThemeBase" />
 
     <style name="AppThemeBase" parent="Theme.Base.DayNight.NoActionBar">