From 73bc96ecf9a16d420533c12e9e1812ffe21c10a2 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Mon, 5 Apr 2021 17:44:02 -0700
Subject: [PATCH] RN: Announce "unselected" Accessibility State (Android)

Summary:
Changes React Native so that when `accessibilityState` is used to change a view from `selected: true` to `selected: false`, the change in state is announced.

This is how `checked` works; it is unclear why Android does not do this for `selected`, too.

Changelog:
[Android][Added] - TalkBack now announces "unselected" when changing `accessibilityState.selected` to false.

Reviewed By: blavalla

Differential Revision: D27449293

fbshipit-source-id: a6d77b55d63655973ad93c4d5e3743742501f378
---
 .../facebook/react/uimanager/BaseViewManager.java    | 12 +++++++++++-
 .../views/uimanager/values/strings_unlocalized.xml   |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 110b933f15..25579c4c29 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -167,7 +167,17 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       return;
     }
     if (accessibilityState.hasKey("selected")) {
-      view.setSelected(accessibilityState.getBoolean("selected"));
+      boolean prevSelected = view.isSelected();
+      boolean nextSelected = accessibilityState.getBoolean("selected");
+      view.setSelected(nextSelected);
+
+      // For some reason, Android does not announce "unselected" when state changes.
+      // This is inconsistent with other platforms, but also with the "checked" state.
+      // So manually announce this.
+      if (view.isAccessibilityFocused() && prevSelected && !nextSelected) {
+        view.announceForAccessibility(
+            view.getContext().getString(R.string.state_unselected_description));
+      }
     } else {
       view.setSelected(false);
     }
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml b/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
index 4c18708bf3..a904f57856 100644
--- a/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
+++ b/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml
@@ -92,6 +92,10 @@
     name="state_collapsed_description"
     translatable="false"
     >collapsed</string>
+  <string
+    name="state_unselected_description"
+    translatable="false"
+    >unselected</string>
   <string
     name="state_on_description"
     translatable="false"