From 2b6edd3efd1c3a88ed47249b77e7b12951d8a13d Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 1 Nov 2023 00:17:38 -0400
Subject: [PATCH 1/2] android: Reorganize settings tab

---
 .../fragments/HomeSettingsFragment.kt         | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
index 6e19fc6c0..ed2a5cb55 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@@ -84,28 +84,6 @@ class HomeSettingsFragment : Fragment() {
                     }
                 )
             )
-            add(
-                HomeSetting(
-                    R.string.open_user_folder,
-                    R.string.open_user_folder_description,
-                    R.drawable.ic_folder_open,
-                    { openFileManager() }
-                )
-            )
-            add(
-                HomeSetting(
-                    R.string.preferences_theme,
-                    R.string.theme_and_color_description,
-                    R.drawable.ic_palette,
-                    {
-                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
-                            null,
-                            Settings.MenuTag.SECTION_THEME
-                        )
-                        binding.root.findNavController().navigate(action)
-                    }
-                )
-            )
             add(
                 HomeSetting(
                     R.string.gpu_driver_manager,
@@ -121,17 +99,6 @@ class HomeSettingsFragment : Fragment() {
                     driverViewModel.selectedDriverMetadata
                 )
             )
-            add(
-                HomeSetting(
-                    R.string.manage_yuzu_data,
-                    R.string.manage_yuzu_data_description,
-                    R.drawable.ic_install,
-                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_installableFragment)
-                    }
-                )
-            )
             add(
                 HomeSetting(
                     R.string.applets,
@@ -146,6 +113,17 @@ class HomeSettingsFragment : Fragment() {
                     R.string.applets_error_description
                 )
             )
+            add(
+                HomeSetting(
+                    R.string.manage_yuzu_data,
+                    R.string.manage_yuzu_data_description,
+                    R.drawable.ic_install,
+                    {
+                        binding.root.findNavController()
+                            .navigate(R.id.action_homeSettingsFragment_to_installableFragment)
+                    }
+                )
+            )
             add(
                 HomeSetting(
                     R.string.select_games_folder,
@@ -170,6 +148,28 @@ class HomeSettingsFragment : Fragment() {
                     { shareLog() }
                 )
             )
+            add(
+                HomeSetting(
+                    R.string.open_user_folder,
+                    R.string.open_user_folder_description,
+                    R.drawable.ic_folder_open,
+                    { openFileManager() }
+                )
+            )
+            add(
+                HomeSetting(
+                    R.string.preferences_theme,
+                    R.string.theme_and_color_description,
+                    R.drawable.ic_palette,
+                    {
+                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
+                            null,
+                            Settings.MenuTag.SECTION_THEME
+                        )
+                        binding.root.findNavController().navigate(action)
+                    }
+                )
+            )
             add(
                 HomeSetting(
                     R.string.about,

From 5872c7d420064a2831520aa3b31a4070c7a17484 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Wed, 1 Nov 2023 00:18:20 -0400
Subject: [PATCH 2/2] android: Adjust driver manager source string

---
 src/android/app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index b92978140..c551a6106 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
     <string name="invalid_keys_error">Invalid encryption keys</string>
     <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
     <string name="install_keys_failure_description">The selected file is incorrect or corrupt. Please redump your keys.</string>
-    <string name="gpu_driver_manager">GPU Driver Manager</string>
+    <string name="gpu_driver_manager">GPU driver manager</string>
     <string name="install_gpu_driver">Install GPU driver</string>
     <string name="install_gpu_driver_description">Install alternative drivers for potentially better performance or accuracy</string>
     <string name="advanced_settings">Advanced settings</string>