For #13761: Add a11y change listener after toolbar is initialised.
Also removed it before reference is removed in onDestroy.master
parent
453dc58ddd
commit
1e223a8a53
|
@ -188,6 +188,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
|
||||||
|
|
||||||
final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
browserInitialized = initializeUI(view) != null
|
browserInitialized = initializeUI(view) != null
|
||||||
|
requireContext().accessibilityManager.addAccessibilityStateChangeListener(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("ComplexMethod", "LongMethod")
|
@Suppress("ComplexMethod", "LongMethod")
|
||||||
|
@ -756,7 +757,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
|
||||||
super.onStart()
|
super.onStart()
|
||||||
requireComponents.core.sessionManager.register(this, this, autoPause = true)
|
requireComponents.core.sessionManager.register(this, this, autoPause = true)
|
||||||
sitePermissionWifiIntegration.get()?.maybeAddWifiConnectedListener()
|
sitePermissionWifiIntegration.get()?.maybeAddWifiConnectedListener()
|
||||||
requireContext().accessibilityManager.addAccessibilityStateChangeListener(this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@CallSuper
|
@CallSuper
|
||||||
|
@ -1062,9 +1062,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
|
||||||
*/
|
*/
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
super.onDestroyView()
|
super.onDestroyView()
|
||||||
|
requireContext().accessibilityManager.removeAccessibilityStateChangeListener(this)
|
||||||
_browserToolbarView = null
|
_browserToolbarView = null
|
||||||
_browserInteractor = null
|
_browserInteractor = null
|
||||||
requireContext().accessibilityManager.removeAccessibilityStateChangeListener(this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
Loading…
Reference in New Issue