tor-browser

commit a2874eeae70f87e08a9fcc56a51d90c1aa42e742
parent a951a95550078a6934da619c5034cf47b58f098d
Author: Harrison Oglesby <oglesby.harrison@gmail.com>
Date:   Wed, 12 Nov 2025 19:02:10 +0000

Bug 1998772 - Add “Site Settings” to settings search r=android-reviewers,Roger

Differential Revision: https://phabricator.services.mozilla.com/D271663

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/DefaultFenixSettingsIndexer.kt
 | 
3
++-
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/PreferenceFileInformation.kt
 | 
27
++++++++++++++++++---------

2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/DefaultFenixSettingsIndexer.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/DefaultFenixSettingsIndexer.kt
@@ -94,6 +94,7 @@ class DefaultFenixSettingsIndexer(private val context: Context) : SettingsIndexe
                             DEFAULT_BROWSER_PREFERENCE_TAG,
                             PREFERENCE_TAG,
                             SWITCH_PREFERENCE_TAG,
+                            SWITCH_PREFERENCE_PLAIN_TAG,
                             TEXT_PERCENTAGE_SEEK_BAR_PREFERENCE_TAG,
                             TOGGLE_RADIO_BUTTON_PREFERENCE_TAG,
                                 -> {
@@ -106,7 +107,6 @@ class DefaultFenixSettingsIndexer(private val context: Context) : SettingsIndexe
                                     }
                             }
                             RADIO_BUTTON_PREFERENCE_TAG,
-                            SWITCH_PREFERENCE_PLAIN_TAG,
                                 -> {
                                 if (categoryItem != null && !categoryItemAdded) {
                                     categoryItemAdded = true
@@ -329,6 +329,7 @@ class DefaultFenixSettingsIndexer(private val context: Context) : SettingsIndexe
             PreferenceFileInformation.OpenLinksInAppsPreferences,
             PreferenceFileInformation.PrivateBrowsingPreferences,
             PreferenceFileInformation.SearchSettingsPreferences,
+            PreferenceFileInformation.SiteSettingsPreferences,
             PreferenceFileInformation.TabsPreferences,
             PreferenceFileInformation.TrackingProtectionPreferences,
             PreferenceFileInformation.SaveLoginsPreferences,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/PreferenceFileInformation.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/PreferenceFileInformation.kt
@@ -101,6 +101,15 @@ sealed class PreferenceFileInformation(
     )
 
     /**
+     * Represents the "Save Logins" settings screen.
+     */
+    object SaveLoginsPreferences : PreferenceFileInformation(
+        xmlResourceId = R.xml.save_logins_preferences,
+        topBreadcrumbResourceId = R.string.preferences_passwords_save_logins_2,
+        fragmentId = R.id.savedLogins,
+    )
+
+    /**
      * Represents the "Search Settings" settings screen.
      */
     object SearchSettingsPreferences : PreferenceFileInformation(
@@ -110,6 +119,15 @@ sealed class PreferenceFileInformation(
     )
 
     /**
+     * Represents the "Site Settings" settings screen.
+     */
+    object SiteSettingsPreferences : PreferenceFileInformation(
+        xmlResourceId = R.xml.site_permissions_preferences,
+        topBreadcrumbResourceId = R.string.preferences_site_settings,
+        fragmentId = R.id.sitePermissionsFragment,
+    )
+
+    /**
      * Represents the "Tabs" settings screen.
      */
     object TabsPreferences : PreferenceFileInformation(
@@ -126,13 +144,4 @@ sealed class PreferenceFileInformation(
         topBreadcrumbResourceId = R.string.preference_enhanced_tracking_protection,
         fragmentId = R.id.trackingProtectionFragment,
     )
-
-    /**
-     * Represents the "Save Logins" settings screen.
-     */
-    object SaveLoginsPreferences : PreferenceFileInformation(
-        xmlResourceId = R.xml.save_logins_preferences,
-        topBreadcrumbResourceId = R.string.preferences_passwords_save_logins_2,
-        fragmentId = R.id.savedLogins,
-    )
 }