diff --git a/Corona-Warn-App/src/device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt b/Corona-Warn-App/src/device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt index b3b01c57a95b745fddddada4b054386e17f69649..51c9fc97be080d39293ba1e9099df08ef45a59db 100644 --- a/Corona-Warn-App/src/device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt +++ b/Corona-Warn-App/src/device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt @@ -75,12 +75,7 @@ class MainFragment : Fragment() { TimerHelper.checkManualKeyRetrievalTimer() submissionViewModel.refreshDeviceUIState() tracingViewModel.refreshLastSuccessfullyCalculatedScore() - binding.mainScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED) - } - - override fun onStart() { - super.onStart() - binding.mainScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED) + binding.mainScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT) } private fun setContentDescription() { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt index 173f6b129f5d55bc125b98f6b01045ea534f03c2..9a6bd0b92f067cf0371595d1674c799776c4c921 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityNodeInfo import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import de.rki.coronawarnapp.R @@ -41,6 +42,7 @@ class InformationFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setButtonOnClickListener() + setAccessibilityDelegate() } override fun onResume() { @@ -48,6 +50,18 @@ class InformationFragment : Fragment() { binding.informationContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT) } + private fun setAccessibilityDelegate() { + val accessibilityDelegate: View.AccessibilityDelegate = + object : View.AccessibilityDelegate() { + override fun onInitializeAccessibilityNodeInfo(v: View?, info: AccessibilityNodeInfo) { + super.onInitializeAccessibilityNodeInfo(v, info) + val string: String = getString(R.string.information_help_title_accessibility) + info.text = string + } + } + binding.informationHelp.mainRowItemSubtitle.accessibilityDelegate = accessibilityDelegate + } + private fun setButtonOnClickListener() { binding.informationAbout.mainRow.setOnClickListener { findNavController().doNavigate( diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 8c950aa76944631b1b2f06a625e1e01c752ddf1c..8ed0ea77191b19e599d55d817c0049d117846031 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -631,6 +631,8 @@ <string name="information_contact_illustration_description">Ein Mann nutzt ein Headset zum Telefonieren.</string> <!-- XLNK: Menu item / hyper link / button text for navigation to FAQ website --> <string name="information_help_title">Häufige Fragen</string> + <!-- XACT: accessibility hint --> + <string name="information_help_title_accessibility">"Häufige Fragen. Aufruf externer Infos im Web"</string> <!-- XHED: Page title for technical information page, also menu item / button text --> <string name="information_technical_title">Rechtliche Hinweise</string> <!-- XACT: describes illustration -->