Change account manager to privacy

WSTxda · Mar 5, 2024 · 8990922 · 8990922
1 parent 0dfef60
commit 8990922
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 12 deletions.
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -451,7 +451,7 @@
 
         <activity
             android:name="org.microg.gms.ui.LegacyAccountSettingsActivity"
-            android:label="@string/account_manager_title"
+            android:label="@string/privacy_title"
             android:process=":ui"
             android:taskAffinity="org.microg.gms.settings" />
 

diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt b/play-services-core/src/main/java/org/microg/gms/ui/AccountsFragment.kt
@@ -154,14 +154,14 @@ class AccountsFragment : PreferenceFragmentCompat() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.accounts_menu_item, menu)
+        inflater.inflate(R.menu.privacy_menu_item, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.account_legacy_settings -> {
-                findNavController().navigate(R.id.accountLegacyFragment)
+            R.id.privacy_settings -> {
+                findNavController().navigate(R.id.privacyFragment)
                 true
             }
 

diff --git a/play-services-core/src/main/res/drawable/ic_privacy.xml b/play-services-core/src/main/res/drawable/ic_privacy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <group>
+        <clip-path android:pathData="M.55.05H24.55V24.05H.55z" />
+        <group>
+            <path
+                android:fillColor="#000000"
+                android:pathData="M12.55 13.05c-0.99 0-1.81-0.34-2.49-1.01-0.67-0.68-1.01-1.5-1.01-2.5 0-0.97 0.34-1.8 1.01-2.48 0.68-0.67 1.5-1.01 2.49-1.01 0.98 0 1.81 0.34 2.49 1.01 0.67 0.68 1 1.5 1 2.49 0 0.98-0.33 1.81-1 2.49-0.68 0.67-1.5 1-2.5 1Zm0-2c0.43 0 0.79-0.14 1.07-0.43 0.29-0.28 0.43-0.64 0.43-1.07 0-0.43-0.14-0.8-0.43-1.08-0.28-0.28-0.64-0.42-1.07-0.42-0.44 0-0.8 0.14-1.08 0.42-0.28 0.29-0.42 0.65-0.42 1.08 0 0.43 0.14 0.79 0.42 1.07 0.29 0.29 0.64 0.43 1.08 0.43Zm0 11c-2.32-0.58-4.23-1.91-5.74-3.99-1.5-2.07-2.26-4.38-2.26-6.91v-6.1l8-3 8 3v6.1c0 2.53-0.76 4.84-2.26 6.91-1.51 2.08-3.43 3.4-5.74 3.99Zm0-17.88l-6 2.25v4.73c0 0.9 0.12 1.77 0.37 2.62 0.25 0.85 0.6 1.65 1.03 2.4 0.7-0.35 1.43-0.62 2.2-0.82 0.76-0.2 1.56-0.3 2.4-0.3 0.83 0 1.63 0.1 2.4 0.3 0.76 0.2 1.5 0.47 2.2 0.82 0.43-0.75 0.77-1.55 1.02-2.4 0.25-0.85 0.38-1.72 0.38-2.62V6.42l-6-2.25Zm0 12.88c-0.6 0-1.19 0.07-1.75 0.2-0.57 0.13-1.11 0.32-1.63 0.55 0.49 0.5 1.01 0.93 1.58 1.3 0.56 0.37 1.16 0.65 1.8 0.85 0.63-0.2 1.23-0.48 1.8-0.85 0.56-0.37 1.09-0.8 1.57-1.3-0.51-0.23-1.06-0.42-1.62-0.55-0.57-0.13-1.15-0.2-1.75-0.2Z" />
+        </group>
+    </group>
+</vector>
diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingTop="10dp"
-        android:text="@string/account_manager_title"
+        android:text="@string/privacy_title"
         android:textColor="?attr/colorPrimary" />
 
     <View

diff --git a/.../src/main/res/menu/accounts_menu_item.xml → ...e/src/main/res/menu/privacy_menu_item.xml b/.../src/main/res/menu/accounts_menu_item.xml → ...e/src/main/res/menu/privacy_menu_item.xml
@@ -2,8 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/account_legacy_settings"
-        android:icon="@drawable/ic_settings"
-        android:title="@string/account_manager_title"
+        android:id="@+id/privacy_settings"
+        android:icon="@drawable/ic_privacy"
+        android:title="@string/privacy_title"
         app:showAsAction="always" />
 </menu>
diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml
@@ -90,9 +90,9 @@
         android:label="@string/menu_advanced" />
 
     <fragment
-        android:id="@+id/accountLegacyFragment"
+        android:id="@+id/privacyFragment"
         android:name="org.microg.gms.ui.LegacyAccountSettingsActivity$AccountSettingsFragment"
-        android:label="@string/account_manager_title" />
+        android:label="@string/privacy_title" />
 
     <!-- About -->
 

diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -11,7 +11,7 @@
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> gostaria de:</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> gostaria de usar:</string>
 
-    <string name="account_manager_title">Gerenciador de contas</string>
+    <string name="privacy_title">Privacidade</string>
     <string name="prefcat_applications">Aplicativos</string>
     <string name="prefcat_authentication">Autenticação</string>
 

diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> would like to:</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> would like to use:</string>
 
-    <string name="account_manager_title">Accounts manager</string>
+    <string name="privacy_title">Privacy</string>
     <string name="prefcat_applications">Applications</string>
     <string name="prefcat_authentication">Authentication</string>