From bfe8bf4663655b0c0a6094090d1b11f4dd632783 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Tue, 24 Sep 2019 10:41:27 +0300
Subject: [PATCH] For #1383 Added tab title to close button content description

---
 .../fenix/home/sessioncontrol/viewholders/TabViewHolder.kt   | 5 +++++
 app/src/main/res/layout/tab_list_row.xml                     | 1 -
 app/src/main/res/values/strings.xml                          | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
index 20fad20a91..44c5a4cb9b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
@@ -96,6 +96,7 @@ class TabViewHolder(
         updateSelected(tab.selected ?: false)
         updatePlayPauseButton(tab.mediaState ?: MediaState.None)
         item_tab.transitionName = "$TAB_ITEM_TRANSITION_NAME${tab.sessionId}"
+        updateCloseButtonDescription(tab.title)
     }
 
     internal fun updatePlayPauseButton(mediaState: MediaState) {
@@ -136,6 +137,10 @@ class TabViewHolder(
     internal fun updateSelected(selected: Boolean) {
         selected_border.visibility = if (selected) View.VISIBLE else View.GONE
     }
+    private fun updateCloseButtonDescription(title: String) {
+        close_tab_button.contentDescription =
+            close_tab_button.context.getString(R.string.close_tab_title, title)
+    }
 
     companion object {
         private const val TAB_ITEM_TRANSITION_NAME = "tab_item"
diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml
index 3b64f9c443..5ba25a9f50 100644
--- a/app/src/main/res/layout/tab_list_row.xml
+++ b/app/src/main/res/layout/tab_list_row.xml
@@ -83,7 +83,6 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:alpha="0.8"
-                android:contentDescription="@string/close_tab"
                 android:src="@drawable/ic_close"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05a50b51b7..f89a43276a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,6 +355,8 @@
     <string name="add_tab">Add tab</string>
     <!-- Content description (not visible, for screen readers etc.): Close tab button. Closes the current session when pressed -->
     <string name="close_tab">Close tab</string>
+    <!-- Content description (not visible, for screen readers etc.): Close tab <title> button. First parameter is tab title  -->
+    <string name="close_tab_title">Close tab %s</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the open tabs menu when pressed -->
     <string name="open_tabs_menu">Open tabs menu</string>
     <!-- Open tabs menu item to close all tabs -->