From 43d30793f5accb2a3475b1e66a982f9e9e504150 Mon Sep 17 00:00:00 2001
From: Mihai Adrian <48995920+mcarare@users.noreply.github.com>
Date: Tue, 5 May 2020 21:22:15 +0300
Subject: [PATCH] For #9794: Announce installing state for screen readers
 (#10111)

---
 .../fenix/addons/AddonsManagementFragment.kt   | 18 ++++++++++++++++++
 .../res/layout/overlay_add_on_progress.xml     |  1 +
 2 files changed, 19 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index 9d37e5569..b2f433a0f 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
+import android.view.accessibility.AccessibilityEvent
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -16,6 +17,7 @@ import androidx.navigation.Navigation
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_add_ons_management.*
 import kotlinx.android.synthetic.main.fragment_add_ons_management.view.*
+import kotlinx.android.synthetic.main.overlay_add_on_progress.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
@@ -29,6 +31,7 @@ import mozilla.components.feature.addons.ui.translatedName
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.theme.ThemeManager
 
@@ -188,6 +191,11 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
 
     private val onPositiveButtonClicked: ((Addon) -> Unit) = { addon ->
         addonProgressOverlay?.visibility = View.VISIBLE
+
+        if (requireContext().settings().accessibilityServicesEnabled) {
+            announceForAccessibility(addonProgressOverlay.add_ons_overlay_text.text)
+        }
+
         isInstallationInProgress = true
 
         requireContext().components.addonManager.installAddon(
@@ -224,6 +232,16 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
         )
     }
 
+    private fun announceForAccessibility(announcementText: CharSequence) {
+        val event = AccessibilityEvent.obtain(
+            AccessibilityEvent.TYPE_ANNOUNCEMENT
+        )
+        addonProgressOverlay.onInitializeAccessibilityEvent(event)
+        event.text.add(announcementText)
+        event.contentDescription = null
+        addonProgressOverlay.parent.requestSendAccessibilityEvent(addonProgressOverlay, event)
+    }
+
     companion object {
         private const val PERMISSIONS_DIALOG_FRAGMENT_TAG = "ADDONS_PERMISSIONS_DIALOG_FRAGMENT"
     }
diff --git a/app/src/main/res/layout/overlay_add_on_progress.xml b/app/src/main/res/layout/overlay_add_on_progress.xml
index 8ee51c617..78b23384c 100644
--- a/app/src/main/res/layout/overlay_add_on_progress.xml
+++ b/app/src/main/res/layout/overlay_add_on_progress.xml
@@ -10,6 +10,7 @@
     android:elevation="1dp">
 
     <TextView
+        android:id="@+id/add_ons_overlay_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"