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 @@ Add tab Close tab + + Close tab %s Open tabs menu