diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 76db0bebf..90df6b7a8 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -3,11 +3,13 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.fenix.browser +import android.content.Context import android.os.Bundle import android.transition.TransitionInflater import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.accessibility.AccessibilityManager import androidx.fragment.app.Fragment import kotlinx.android.synthetic.main.fragment_browser.* import mozilla.components.feature.session.SessionFeature @@ -16,6 +18,7 @@ import mozilla.components.support.ktx.android.arch.lifecycle.addObservers import org.mozilla.fenix.R import org.mozilla.fenix.components.toolbar.ToolbarIntegration import org.mozilla.fenix.ext.requireComponents +import androidx.coordinatorlayout.widget.CoordinatorLayout class BrowserFragment : Fragment() { @@ -54,5 +57,12 @@ class BrowserFragment : Fragment() { ) lifecycle.addObservers(sessionFeature) + + // Stop toolbar from collapsing if TalkBack is enabled + val accessibilityManager = context?.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager + if (accessibilityManager.isEnabled) { + val layoutParams = toolbar.layoutParams as CoordinatorLayout.LayoutParams + layoutParams.behavior = null + } } } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt index f416fa673..391c6a003 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/Toolbar.kt @@ -40,7 +40,7 @@ class Toolbar( val back = BrowserMenuItemToolbar.Button( mozilla.components.ui.icons.R.drawable.mozac_ic_back, iconTintColorResource = R.color.icons, - contentDescription = "Back" + contentDescription = context.getString(R.string.browser_menu_back) ) { sessionUseCases.goBack.invoke() } @@ -48,7 +48,7 @@ class Toolbar( val forward = BrowserMenuItemToolbar.Button( mozilla.components.ui.icons.R.drawable.mozac_ic_forward, iconTintColorResource = R.color.icons, - contentDescription = "Forward" + contentDescription = context.getString(R.string.browser_menu_forward) ) { sessionUseCases.goForward.invoke() } @@ -56,7 +56,7 @@ class Toolbar( val refresh = BrowserMenuItemToolbar.Button( mozilla.components.ui.icons.R.drawable.mozac_ic_refresh, iconTintColorResource = R.color.icons, - contentDescription = "Refresh" + contentDescription = context.getString(R.string.browser_menu_refresh) ) { sessionUseCases.reload.invoke() } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index 85faf18f4..e61c920ef 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -32,8 +32,7 @@ class ToolbarIntegration( context.resources.getDrawable( R.drawable.ic_home, context.application.theme - ), - "Home" + ), context.getString(R.string.browser_home_button) ) { Navigation.findNavController(toolbar).navigate(R.id.action_browserFragment_to_homeFragment) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 88784fafd..3d30f8db2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,9 +4,14 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> Fenix - Search the Web or enter address Share with… + Home + + + Back + Forward + Refresh Help Settings Your Library