From ff1ba4a9202cc222b5332f29693110ab89c41af0 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 11 Jan 2023 11:09:17 +0530
Subject: [PATCH] Settings: top_level_settings: Move accounts entry to top

- Use title string Accounts_settings_title instead of account_dashboard_title
---
 AndroidManifest.xml                           |  2 +-
 res/xml/accounts_dashboard_settings.xml       |  2 +-
 .../accounts_dashboard_settings_header.xml    |  2 +-
 .../accounts_personal_dashboard_settings.xml  |  2 +-
 res/xml/accounts_work_dashboard_settings.xml  |  2 +-
 res/xml/top_level_settings.xml                | 22 +++++++++----------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9fed8e98df8..b00887dd4d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3769,7 +3769,7 @@
 
         <activity
             android:name=".Settings$AccountDashboardActivity"
-            android:label="@string/account_dashboard_title"
+            android:label="@string/Accounts_settings_title"
             android:exported="true"
             android:icon="@drawable/ic_homepage_accounts">
             <intent-filter android:priority="1">
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index c8627e7e9e7..6d9364a67f5 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/accounts_dashboard_settings_header.xml b/res/xml/accounts_dashboard_settings_header.xml
index 99f07360f48..ebb35577e32 100644
--- a/res/xml/accounts_dashboard_settings_header.xml
+++ b/res/xml/accounts_dashboard_settings_header.xml
@@ -17,6 +17,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:searchable="false">
 </PreferenceScreen>
diff --git a/res/xml/accounts_personal_dashboard_settings.xml b/res/xml/accounts_personal_dashboard_settings.xml
index e0ba71bbef3..29b92b818aa 100644
--- a/res/xml/accounts_personal_dashboard_settings.xml
+++ b/res/xml/accounts_personal_dashboard_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/accounts_work_dashboard_settings.xml b/res/xml/accounts_work_dashboard_settings.xml
index 32699338434..947918d0e5b 100644
--- a/res/xml/accounts_work_dashboard_settings.xml
+++ b/res/xml/accounts_work_dashboard_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
-    android:title="@string/account_dashboard_title"
+    android:title="@string/Accounts_settings_title"
     settings:keywords="@string/keywords_accounts">
 
     <PreferenceCategory
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 602f3399063..176861ff48d 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -26,12 +26,22 @@
         android:title="@string/system_update_settings_list_item_title"
         android:summary="@string/system_update_summary"
         android:icon="@drawable/ic_updater"
-        android:order="-160"
+        android:order="-170"
         settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
         settings:keywords="@string/keywords_system_update_settings">
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
     </com.android.settings.widget.HomepagePreference>
 
+    <com.android.settings.widget.HomepagePreference
+        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+        android:icon="@drawable/ic_settings_accounts"
+        android:key="top_level_accounts"
+        android:order="-160"
+        android:title="@string/Accounts_settings_title"
+        android:summary="@string/summary_placeholder"
+        settings:highlightableMenuKey="@string/menu_key_accounts"
+        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_wireless"
@@ -174,16 +184,6 @@
         android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
         settings:highlightableMenuKey="@string/menu_key_emergency"/>
 
-    <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
-        android:icon="@drawable/ic_settings_accounts"
-        android:key="top_level_accounts"
-        android:order="-10"
-        android:title="@string/account_dashboard_title"
-        android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_accounts"
-        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.system.SystemDashboardFragment"
         android:icon="@drawable/ic_settings_system_dashboard_white"
-- 
GitLab