tor-browser

commit 97d927c6ab4ca4ae77993f084d752fe30e7b38aa
parent a154253cbbdb989a189bc8ac03580a36d2498aca
Author: Harrison Oglesby <oglesby.harrison@gmail.com>
Date:   Tue,  6 Jan 2026 00:28:27 +0000

Bug 2007399 - ContentDescription for settings search button r=android-reviewers,android-l10n-reviewers,flod,skhan

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
 | 
11
+++++++----
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
 | 
1
+
M
mobile/android/fenix/app/src/main/res/values/strings.xml
 | 
2
++

3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
@@ -86,14 +86,16 @@ fun Fragment.showToolbar(title: String) {
  * Throws if the fragment is not attached to an [AppCompatActivity].
  *
  * @param title The title of the toolbar.
+ * @param contentDescription The content description of the icon button for accessibility.
  * @param iconResId The resource ID of the icon to be displayed.
  * @param onClick The click event for the icon button.
  */
 fun Fragment.showToolbarWithIconButton(
-        title: String,
-        iconResId: Int,
-        onClick: () -> Unit,
- ) {
+    title: String,
+    contentDescription: String,
+    iconResId: Int,
+    onClick: () -> Unit,
+) {
     val activity = requireActivity() as AppCompatActivity
     activity.title = title
     activity.setNavigationIcon(iconsR.drawable.mozac_ic_back_24)
@@ -106,6 +108,7 @@ fun Fragment.showToolbarWithIconButton(
 
             val item = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, "")
             item.setIcon(iconResId)
+            item.contentDescription = contentDescription
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
             item.setOnMenuItemClickListener {
                 onClick()
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -224,6 +224,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         if (showSearch) {
             showToolbarWithIconButton(
                 title = toolbarTitle,
+                contentDescription = getString(R.string.settings_search_button_content_description),
                 iconResId = R.drawable.ic_search,
                 onClick = {
                     SettingsSearch.opened.record()
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -3666,6 +3666,8 @@
     <string name="settings_search_no_results_title">Nothing turned up</string>
     <!-- Sub-message displayed when the search field is not empty but search results is empty. -->
     <string name="settings_search_no_results_message">Maybe try a different search?</string>
+    <!-- Content Description for the button to open Settings Search (to search through settings). -->
+    <string name="settings_search_button_content_description">Settings search button</string>
 
     <!-- ==== Terms of use pop up prompt ==== -->