Remove logic for announcing nested text

announcement of TtsSpan works with Text and nested text, but they are
not focusable. The functionality will be added as second PR

Author: fabOnReact

Libraries/Text/Text.js

@@ -226,7 +226,6 @@ const Text: React.AbstractComponent<
       accessibilityState={_accessibilityState}
       {...eventHandlersForText}
       accessibilityLabel={ariaLabel ?? accessibilityLabel}
-      accessibilityUnit="none"
       accessibilityRole={
         role ? getAccessibilityRoleFromRole(role) : accessibilityRole
       }
@@ -252,7 +251,6 @@ const Text: React.AbstractComponent<
             : _accessible
         }
         accessibilityLabel={ariaLabel ?? accessibilityLabel}
-        accessibilityUnit="none"
         accessibilityState={nativeTextAccessibilityState}
         accessibilityRole={
           role ? getAccessibilityRoleFromRole(role) : accessibilityRole

Libraries/Text/TextProps.js

@@ -15,7 +15,6 @@ import type {
   AccessibilityActionInfo,
   AccessibilityRole,
   AccessibilityState,
-  AccessibilityUnit,
   Role,
 } from '../Components/View/ViewAccessibility';
 import type {TextStyleProp} from '../StyleSheet/StyleSheet';
@@ -58,7 +57,6 @@ export type TextProps = $ReadOnly<{|
   accessibilityLanguage?: ?Stringish,
   accessibilityLabel?: ?Stringish,
   accessibilityRole?: ?AccessibilityRole,
-  accessibilityUnit?: ?AccessibilityUnit,
   accessibilityState?: ?AccessibilityState,
   'aria-label'?: ?string,
 

ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -26,7 +26,6 @@
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
-import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityUnit;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.PointerEventHelper;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
@@ -251,14 +250,6 @@ public void setAccessibilityRole(@NonNull T view, @Nullable String accessibility
     view.setTag(R.id.accessibility_role, AccessibilityRole.fromValue(accessibilityRole));
   }
 
-  @ReactProp(name = ViewProps.ACCESSIBILITY_UNIT)
-  public void setAccessibilityUnit(@NonNull T view, @Nullable String accessibilityUnit) {
-    if (accessibilityUnit == null) {
-      return;
-    }
-    view.setTag(R.id.accessibility_unit, AccessibilityUnit.fromValue(accessibilityUnit));
-  }
-
   @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION)
   public void setAccessibilityCollection(

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java

@@ -74,7 +74,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
 
   private final View mView;
   private final AccessibilityLinks mAccessibilityLinks;
-  private final AccessibilityLinks mAccessibilitySpans;
 
   private Handler mHandler;
 
@@ -90,36 +89,6 @@ private void scheduleAccessibilityEventSender(View host) {
     Message msg = mHandler.obtainMessage(SEND_EVENT, host);
     mHandler.sendMessageDelayed(msg, TIMEOUT_SEND_ACCESSIBILITY_EVENT);
   }
-  /**
-   * These roles are defined by Google's TalkBack screen reader, and this list should be kept up to
-   * date with their implementation. Details can be seen in their source code here:
-   *
-   * <p>https://github.com/google/talkback/blob/master/utils/src/main/java/Unit.java
-   */
-  public enum AccessibilityUnit {
-    NONE,
-    VERBATIM;
-
-    public static String getValue(AccessibilityUnit role) {
-      switch (role) {
-        case VERBATIM:
-          return "android.type.verbatim";
-        case NONE:
-          return "android.type.text";
-        default:
-          throw new IllegalArgumentException("Invalid accessibility role value: " + role);
-      }
-    }
-
-    public static AccessibilityUnit fromValue(@Nullable String value) {
-      for (AccessibilityUnit unit : AccessibilityUnit.values()) {
-        if (unit.name().equalsIgnoreCase(value)) {
-          return unit;
-        }
-      }
-      throw new IllegalArgumentException("Invalid accessibility unit value: " + value);
-    }
-  }
 
   /**
    * These roles are defined by Google's TalkBack screen reader, and this list should be kept up to
@@ -253,7 +222,6 @@ public void handleMessage(Message msg) {
     mView.setFocusable(originalFocus);
     ViewCompat.setImportantForAccessibility(mView, originalImportantForAccessibility);
     mAccessibilityLinks = (AccessibilityLinks) mView.getTag(R.id.accessibility_links);
-    mAccessibilitySpans = (AccessibilityLinks) mView.getTag(R.id.accessibility_spans);
   }
 
   @Nullable View mAccessibilityLabelledBy;
@@ -617,21 +585,6 @@ protected void onPopulateNodeForVirtualView(
     node.setBoundsInParent(getBoundsInParent(accessibleTextSpan));
     node.setRoleDescription(mView.getResources().getString(R.string.link_description));
     node.setClassName(AccessibilityRole.getValue(AccessibilityRole.BUTTON));
-    if (mAccessibilitySpans == null) {
-      return;
-    }
-    final AccessibilityLinks.AccessibleLink ttsSpan =
-        mAccessibilitySpans.getLinkById(virtualViewId);
-    if (ttsSpan == null) {
-      return;
-    }
-    SpannableString spannableString = new SpannableString(ttsSpan.description);
-    spannableString.setSpan(
-        ttsSpan.span,
-        java.lang.Math.min(spannableString.length(), ttsSpan.start),
-        java.lang.Math.max(ttsSpan.start, ttsSpan.end - 1),
-        0);
-    node.setContentDescription(spannableString);
   }
 
   private Rect getBoundsInParent(AccessibilityLinks.AccessibleLink accessibleLink) {

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java

@@ -154,7 +154,6 @@ public class ViewProps {
   public static final String ACCESSIBILITY_HINT = "accessibilityHint";
   public static final String ACCESSIBILITY_LIVE_REGION = "accessibilityLiveRegion";
   public static final String ACCESSIBILITY_ROLE = "accessibilityRole";
-  public static final String ACCESSIBILITY_UNIT = "accessibilityUnit";
   public static final String ACCESSIBILITY_STATE = "accessibilityState";
   public static final String ACCESSIBILITY_ACTIONS = "accessibilityActions";
   public static final String ACCESSIBILITY_VALUE = "accessibilityValue";

ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

@@ -53,7 +53,6 @@ public class TextAttributeProps {
   public static final short TA_KEY_IS_HIGHLIGHTED = 20;
   public static final short TA_KEY_LAYOUT_DIRECTION = 21;
   public static final short TA_KEY_ACCESSIBILITY_ROLE = 22;
-  public static final short TA_KEY_ACCESSIBILITY_UNIT = 89;
 
   public static final int UNSET = -1;
 
@@ -104,8 +103,8 @@ public class TextAttributeProps {
   protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityRole = null;
   protected boolean mIsAccessibilityRoleSet = false;
   protected boolean mIsAccessibilityUnitSet = false;
-  protected @Nullable ReactAccessibilityDelegate.AccessibilityUnit mAccessibilityUnit =
-      ReactAccessibilityDelegate.AccessibilityUnit.NONE;
+  protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityUnit =
+      ReactAccessibilityDelegate.AccessibilityRole.NONE;
   protected boolean mIsAccessibilityLink = false;
   protected boolean mIsAccessibilityUnit = false;
 
@@ -210,9 +209,6 @@ public static TextAttributeProps fromMapBuffer(MapBuffer props) {
         case TA_KEY_ACCESSIBILITY_ROLE:
           result.setAccessibilityRole(entry.getStringValue());
           break;
-        case TA_KEY_ACCESSIBILITY_UNIT:
-          result.setAccessibilityUnit(entry.getStringValue());
-          break;
       }
     }
 
@@ -254,7 +250,6 @@ public static TextAttributeProps fromReadableMap(ReactStylesDiffMap props) {
     result.setTextTransform(getStringProp(props, PROP_TEXT_TRANSFORM));
     result.setLayoutDirection(getStringProp(props, ViewProps.LAYOUT_DIRECTION));
     result.setAccessibilityRole(getStringProp(props, ViewProps.ACCESSIBILITY_ROLE));
-    result.setAccessibilityUnit(getStringProp(props, ViewProps.ACCESSIBILITY_UNIT));
     return result;
   }
 
@@ -608,14 +603,6 @@ private void setTextTransform(@Nullable String textTransform) {
     }
   }
 
-  private void setAccessibilityUnit(@Nullable String accessibilityUnit) {
-    if (accessibilityUnit != null) {
-      mIsAccessibilityUnitSet = true;
-      mAccessibilityUnit =
-          ReactAccessibilityDelegate.AccessibilityUnit.fromValue(accessibilityUnit);
-    }
-  }
-
   private void setAccessibilityRole(@Nullable String accessibilityRole) {
     if (accessibilityRole != null) {
       mIsAccessibilityRoleSet = true;

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt

@@ -64,7 +64,6 @@ object ReactMapBufferPropSetter {
   private const val VP_POINTER_OVER_CAPTURE = 44
   private const val VP_BORDER_CURVES = 45 // iOS only
   private const val VP_FG_COLOR = 46 // iOS only?
-  private const val VP_ACCESSIBILITY_UNIT = 89
 
   // Yoga values
   private const val YG_BORDER_WIDTH = 100
@@ -241,9 +240,6 @@ object ReactMapBufferPropSetter {
         VP_ZINDEX -> {
           viewManager.setZIndex(view, entry.intValue.toFloat())
         }
-        VP_ACCESSIBILITY_UNIT -> {
-          viewManager.setAccessibilityUnit(view, entry.stringValue.takeIf { it.isNotEmpty() })
-        }
         YG_BORDER_WIDTH -> {
           viewManager.borderWidth(view, entry.mapBufferValue)
         }