@@ -75,7 +75,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
75
75
private final View mView ;
76
76
private final AccessibilityLinks mAccessibilityLinks ;
77
77
private final AccessibilityLinks mAccessibilitySpans ;
78
- // private final TtsSpan.MoneyBuilder mSpanned;
79
78
80
79
private Handler mHandler ;
81
80
@@ -234,8 +233,6 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
234
233
final String accessibilityHint = (String ) host .getTag (R .id .accessibility_hint );
235
234
if (accessibilityRole != null ) {
236
235
setRole (info , accessibilityRole , host .getContext ());
237
- info .setHeading (true );
238
- info .setRoleDescription ("heading" );
239
236
}
240
237
241
238
if (accessibilityHint != null ) {
@@ -595,15 +592,13 @@ protected void onPopulateNodeForVirtualView(
595
592
if (ttsSpan == null ) {
596
593
return ;
597
594
}
598
- if (mView instanceof TextView ) {
599
- SpannableString spannableString = new SpannableString (ttsSpan .description );
600
- spannableString .setSpan (
601
- ttsSpan .span ,
602
- java .lang .Math .min (spannableString .length (), ttsSpan .start ),
603
- java .lang .Math .max (ttsSpan .start , ttsSpan .end - 1 ),
604
- 0 );
605
- node .setContentDescription (spannableString );
606
- }
595
+ SpannableString spannableString = new SpannableString (ttsSpan .description );
596
+ spannableString .setSpan (
597
+ ttsSpan .span ,
598
+ java .lang .Math .min (spannableString .length (), ttsSpan .start ),
599
+ java .lang .Math .max (ttsSpan .start , ttsSpan .end - 1 ),
600
+ 0 );
601
+ node .setContentDescription (spannableString );
607
602
}
608
603
609
604
private Rect getBoundsInParent (AccessibilityLinks .AccessibleLink accessibleLink ) {
@@ -684,15 +679,14 @@ public AccessibilityLinks(ReactSpan[] spans, Spannable text) {
684
679
}
685
680
686
681
final AccessibleLink link = new AccessibleLink ();
682
+ link .description = text .subSequence (start , end ).toString ();
687
683
if (span instanceof ReactTtsSpan ) {
688
684
link .span = span ;
689
685
SpannableString spannableDescription = new SpannableString (text .subSequence (start , end ));
690
- link .description = spannableDescription .toString ();
691
686
link .start = spannableDescription .getSpanStart (span );
692
687
link .end = spannableDescription .getSpanEnd (span );
693
688
}
694
689
if (span instanceof ClickableSpan ) {
695
- link .description = text .subSequence (start , end ).toString ();
696
690
link .start = start ;
697
691
link .end = end ;
698
692
}
0 commit comments