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 1/2] 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 20fad20a9..44c5a4cb9 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 3b64f9c44..5ba25a9f5 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 05a50b51b..f89a43276 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 -->

From 1c6aefd82bff6262fcab2a18a651db1d80971576 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Tue, 8 Oct 2019 17:06:02 +0300
Subject: [PATCH 2/2] For #3604 Snackbar messages for closing tabs use closed
 instead of deleted

---
 .../org/mozilla/fenix/home/HomeFragment.kt     | 18 ++++++++++++------
 app/src/main/res/values/strings.xml            |  8 ++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 78341e47e..b14bd5b07 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -386,14 +386,14 @@ class HomeFragment : Fragment() {
             }
             is TabAction.Close -> {
                 if (pendingSessionDeletion?.deletionJob == null) {
-                    removeTabWithUndo(action.sessionId)
+                    removeTabWithUndo(action.sessionId, browsingModeManager.mode.isPrivate)
                 } else {
                     pendingSessionDeletion?.deletionJob?.let {
                         viewLifecycleOwner.lifecycleScope.launch {
                             it.invoke()
                         }.invokeOnCompletion {
                             pendingSessionDeletion = null
-                            removeTabWithUndo(action.sessionId)
+                            removeTabWithUndo(action.sessionId, browsingModeManager.mode.isPrivate)
                         }
                     }
                 }
@@ -719,9 +719,9 @@ class HomeFragment : Fragment() {
         deleteAllSessionsJob = deleteOperation
 
         val snackbarMessage = if (private) {
-            getString(R.string.snackbar_private_tabs_deleted)
+            getString(R.string.snackbar_private_tabs_closed)
         } else {
-            getString(R.string.snackbar_tab_deleted)
+            getString(R.string.snackbar_tabs_closed)
         }
 
         viewLifecycleOwner.lifecycleScope.allowUndo(
@@ -739,7 +739,7 @@ class HomeFragment : Fragment() {
         )
     }
 
-    private fun removeTabWithUndo(sessionId: String) {
+    private fun removeTabWithUndo(sessionId: String, private: Boolean) {
         val sessionManager = requireComponents.core.sessionManager
         val deleteOperation: (suspend () -> Unit) = {
             sessionManager.findSessionById(sessionId)
@@ -751,9 +751,15 @@ class HomeFragment : Fragment() {
 
         pendingSessionDeletion = PendingSessionDeletion(deleteOperation, sessionId)
 
+        val snackbarMessage = if (private) {
+            getString(R.string.snackbar_private_tab_closed)
+        } else {
+            getString(R.string.snackbar_tab_closed)
+        }
+
         viewLifecycleOwner.lifecycleScope.allowUndo(
             view!!,
-            getString(R.string.snackbar_tab_deleted),
+            snackbarMessage,
             getString(R.string.snackbar_deleted_undo), {
                 pendingSessionDeletion = null
                 emitSessionChanges()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 326f4e0e3..a55315ba9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -637,6 +637,14 @@
     <string name="snackbar_tab_deleted">Tab deleted</string>
     <!-- Text shown in snackbar when user deletes all tabs -->
     <string name="snackbar_tabs_deleted">Tabs deleted</string>
+    <!-- Text shown in snackbar when user closes a tab -->
+    <string name="snackbar_tab_closed">Tab closed</string>
+    <!-- Text shown in snackbar when user closes all tabs -->
+    <string name="snackbar_tabs_closed">Tabs closed</string>
+    <!-- Text shown in snackbar when user closes a private tab -->
+    <string name="snackbar_private_tab_closed">Private tab closed</string>
+    <!-- Text shown in snackbar when user closes all private tabs -->
+    <string name="snackbar_private_tabs_closed">Private tabs closed</string>
     <!-- Text shown in snackbar when user deletes all private tabs -->
     <string name="snackbar_private_tabs_deleted">Private tabs deleted</string>
     <!-- Text for action to undo deleting a tab or collection shown in snackbar -->