From c42ccb4966f8aabcab8e1964302603cdd91c79b1 Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Wed, 10 Nov 2021 16:26:38 +0200
Subject: [PATCH] For #22388 - Update content description of the delete button

---
 .../history/viewholders/HistoryListItemViewHolder.kt  | 11 +++++++----
 .../view/HistoryMetadataGroupItemViewHolder.kt        | 11 +++++++----
 .../recentlyclosed/RecentlyClosedItemViewHolder.kt    | 11 +++++++----
 app/src/main/res/values/strings.xml                   |  4 ++--
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
index 8e4a177282..720c90d093 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
@@ -33,10 +33,13 @@ class HistoryListItemViewHolder(
             historyInteractor.onRecentlyClosedClicked()
         }
 
-        binding.historyLayout.overflowView.setImageResource(R.drawable.ic_close)
-        binding.historyLayout.overflowView.setOnClickListener {
-            val item = this.item ?: return@setOnClickListener
-            historyInteractor.onDeleteSome(setOf(item))
+        binding.historyLayout.overflowView.apply {
+            setImageResource(R.drawable.ic_close)
+            contentDescription = view.context.getString(R.string.history_delete_item)
+            setOnClickListener {
+                val item = item ?: return@setOnClickListener
+                historyInteractor.onDeleteSome(setOf(item))
+            }
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
index 1f5c9fc65d..e721a461bb 100644
--- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
@@ -28,10 +28,13 @@ class HistoryMetadataGroupItemViewHolder(
     private var item: History.Metadata? = null
 
     init {
-        binding.historyLayout.overflowView.setImageResource(R.drawable.ic_close)
-        binding.historyLayout.overflowView.setOnClickListener {
-            val item = this.item ?: return@setOnClickListener
-            interactor.onDelete(setOf(item))
+        binding.historyLayout.overflowView.apply {
+            setImageResource(R.drawable.ic_close)
+            contentDescription = view.context.getString(R.string.history_delete_item)
+            setOnClickListener {
+                val item = item ?: return@setOnClickListener
+                interactor.onDelete(setOf(item))
+            }
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
index becc98fc1d..4d6e20deac 100644
--- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
@@ -24,10 +24,13 @@ class RecentlyClosedItemViewHolder(
     private var item: RecoverableTab? = null
 
     init {
-        binding.historyLayout.overflowView.setImageResource(R.drawable.ic_close)
-        binding.historyLayout.overflowView.setOnClickListener {
-            val item = this.item ?: return@setOnClickListener
-            recentlyClosedFragmentInteractor.onDelete(item)
+        binding.historyLayout.overflowView.apply {
+            setImageResource(R.drawable.ic_close)
+            contentDescription = view.context.getString(R.string.history_delete_item)
+            setOnClickListener {
+                val item = item ?: return@setOnClickListener
+                recentlyClosedFragmentInteractor.onDelete(item)
+            }
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7157fb798..d6bad9266b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -863,8 +863,8 @@
     <string name="history_menu_open_in_new_tab_button" moz:removedIn="94" tools:ignore="UnusedResources">Open in new tab</string>
     <!-- History overflow menu open in private tab button -->
     <string name="history_menu_open_in_private_tab_button" moz:removedIn="94" tools:ignore="UnusedResources">Open in private tab</string>
-    <!-- Text for the button to delete a single history item -->
-    <string name="history_delete_item" moz:removedIn="94" tools:ignore="UnusedResources">Delete</string>
+    <!-- Context description text for the button to delete a single history item -->
+    <string name="history_delete_item">Delete</string>
     <!-- History multi select title in app bar
     The first parameter is the number of bookmarks selected -->
     <string name="history_multi_select_title">%1$d selected</string>