From b483067bd9e81283a2e1b12fede9d1a0f0106ca8 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Tue, 21 Jul 2020 10:05:27 -0700 Subject: [PATCH] For #12461: Update content description for tabs tray open tab count --- .../java/org/mozilla/fenix/tabtray/TabTrayView.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt index 7177b2fad..a5e87a297 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt @@ -16,6 +16,7 @@ import androidx.lifecycle.LifecycleCoroutineScope import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.tabs.TabLayout import kotlinx.android.extensions.LayoutContainer +import kotlinx.android.synthetic.main.component_tabstray.* import kotlinx.android.synthetic.main.component_tabstray.view.* import kotlinx.android.synthetic.main.component_tabstray_fab.view.* import kotlinx.android.synthetic.main.tabs_tray_tab_counter.* @@ -37,7 +38,7 @@ import org.mozilla.fenix.ext.settings /** * View that contains and configures the BrowserAwesomeBar */ -@Suppress("LongParameterList") +@Suppress("LongParameterList", "TooManyFunctions", "LargeClass") class TabTrayView( private val container: ViewGroup, private val interactor: TabTrayInteractor, @@ -248,6 +249,15 @@ class TabTrayView( view.tab_tray_overflow.isVisible = !hasNoTabs counter_text.text = "${state.normalTabs.size}" + updateTabCounterContentDescription(state.normalTabs.size) + } + } + + private fun updateTabCounterContentDescription(count: Int) { + view.tab_layout.getTabAt(0)?.contentDescription = if (count == 1) { + view.context?.getString(R.string.open_tab_tray_single) + } else { + view.context?.getString(R.string.open_tab_tray_plural, count.toString()) } }