From fbec001e2850dacbf1ba55823b2f9752925b696c Mon Sep 17 00:00:00 2001 From: Mihai Adrian <48995920+mcarare@users.noreply.github.com> Date: Mon, 21 Oct 2019 20:00:26 +0300 Subject: [PATCH] For #1383: Fix updating description of close button on title change. (#6020) --- .../fenix/home/sessioncontrol/SessionControlAdapter.kt | 4 +++- .../fenix/home/sessioncontrol/viewholders/TabViewHolder.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt index 230cdd609..af9a98173 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt @@ -220,7 +220,9 @@ class SessionControlAdapter( holder.play_pause_button.visibility = View.GONE if (it.shouldUpdateHostname) { holder.updateHostname(it.tab.hostname) } - if (it.shouldUpdateTitle) { holder.updateTitle(it.tab.title) } + if (it.shouldUpdateTitle) { + holder.updateTitle(it.tab.title) + holder.updateCloseButtonDescription(it.tab.title) } if (it.shouldUpdateFavicon) { holder.updateFavIcon(it.tab.url, it.tab.icon) } 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 102e9ba5f..2c44004c0 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 @@ -143,7 +143,7 @@ class TabViewHolder( internal fun updateSelected(selected: Boolean) { selected_border.visibility = if (selected) View.VISIBLE else View.GONE } - private fun updateCloseButtonDescription(title: String) { + internal fun updateCloseButtonDescription(title: String) { close_tab_button.contentDescription = close_tab_button.context.getString(R.string.close_tab_title, title) }