[Android] Main settings reorganisation (#29086)

- Renamed `Autofill` section to `Passwords and Autofill`
- Moved `Brave Password Manager` and `Autofill services` to the new section

android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java

@@ -60,7 +60,6 @@ public abstract class BraveMainPreferencesBase extends BravePreferenceFragment
     private static final String PREF_GENERAL_SECTION = "general_section";
     private static final String PREF_BASICS_SECTION = "basics_section";
     private static final String PREF_ADVANCED_SECTION = "advanced_section";
-    private static final String PREF_ONLINE_CHECKOUT_SECTION = "online_checkout_section";
     private static final String PREF_SUPPORT_SECTION = "support_section";
     private static final String PREF_ABOUT_SECTION = "about_section";
 
@@ -314,7 +313,6 @@ public abstract class BraveMainPreferencesBase extends BravePreferenceFragment
             removePreferenceIfPresent(PREF_HOME_SCREEN_WIDGET);
         }
 
-        setPreferenceOrder(PREF_PASSWORDS, ++generalOrder);
         setPreferenceOrder(PREF_SYNC, ++generalOrder);
         setPreferenceOrder(PREF_BRAVE_STATS, ++generalOrder);
         // if notification is not available (eg. for emulators)
@@ -340,14 +338,15 @@ public abstract class BraveMainPreferencesBase extends BravePreferenceFragment
         setPreferenceOrder(PREF_ACCESSIBILITY, ++displaySectionOrder);
         setPreferenceOrder(PREF_BRAVE_LANGUAGES, ++displaySectionOrder);
 
-        int onlineCheckoutSectionOrder = displaySectionOrder;
-        setPreferenceOrder(PREF_ONLINE_CHECKOUT_SECTION, ++onlineCheckoutSectionOrder);
+        int passwordsAndAutofillSectionOrder = displaySectionOrder;
+        setPreferenceOrder(MainSettings.PREF_AUTOFILL_SECTION, ++passwordsAndAutofillSectionOrder);
+        setPreferenceOrder(PREF_PASSWORDS, ++passwordsAndAutofillSectionOrder);
+        setPreferenceOrder(MainSettings.PREF_AUTOFILL_OPTIONS, ++passwordsAndAutofillSectionOrder);
+        setPreferenceOrder(PREF_PAYMENT_METHODS, ++passwordsAndAutofillSectionOrder);
+        setPreferenceOrder(PREF_ADDRESSES, ++passwordsAndAutofillSectionOrder);
+        setPreferenceOrder(PREF_AUTOFILL_PRIVATE_WINDOW, ++passwordsAndAutofillSectionOrder);
 
-        setPreferenceOrder(PREF_PAYMENT_METHODS, ++onlineCheckoutSectionOrder);
-        setPreferenceOrder(PREF_ADDRESSES, ++onlineCheckoutSectionOrder);
-        setPreferenceOrder(PREF_AUTOFILL_PRIVATE_WINDOW, ++onlineCheckoutSectionOrder);
-
-        int supportSectionOrder = onlineCheckoutSectionOrder;
+        int supportSectionOrder = passwordsAndAutofillSectionOrder;
         setPreferenceOrder(PREF_SUPPORT_SECTION, ++supportSectionOrder);
 
         setPreferenceOrder(PREF_RATE_BRAVE, ++supportSectionOrder);

android/java/res/xml/brave_main_preferences.xml

@@ -98,10 +98,6 @@
         android:order="18"
         android:icon="@drawable/ic_new_tab_page"
         android:title="@string/prefs_new_tab_page"/>
-    <PreferenceCategory
-        android:key="online_checkout_section"
-        android:order="21"
-        android:title="@string/prefs_section_autofill_brave"/>
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="autofill_private_window"
         android:order="21"

android/javatests/org/chromium/chrome/browser/settings/BraveMainSettingsFragmentTest.java

@@ -46,7 +46,6 @@ public class BraveMainSettingsFragmentTest {
         "general_section",
         "brave_search_engines",
         "homepage",
-        "passwords",
         "brave_sync_layout",
         "brave_stats",
         "content_settings",
@@ -60,8 +59,9 @@ public class BraveMainSettingsFragmentTest {
         "background_images",
         "accessibility",
         "brave_languages",
-        // Somehow this is the key for Autofill section
-        "online_checkout_section",
+        "autofill_section",
+        "passwords",
+        "autofill_options",
         "autofill_payment_methods",
         "autofill_addresses",
         "autofill_private_window",

browser/ui/android/strings/android_brave_strings.grd

@@ -465,9 +465,6 @@ This file contains all "about" strings.  It is set to NOT be translated, in tran
       <message name="IDS_ACCESSIBILITY_TOOLBAR_BTN_BRAVE_REWARDS" desc="Content description for the button that is enable, disable Brave Rewards.">
         Manage Brave Rewards
       </message>
-      <message name="IDS_PREFS_SECTION_AUTOFILL_BRAVE" desc="Title for Autofill section">
-        Autofill
-      </message>
       <message name="IDS_PREFS_AUTOFILL_PRIVATE_WINDOW_TITLE" desc="Title for Autofill in private window option in settings">
         Autofill in private tabs
       </message>