Skip to content

Commit f66e914

Browse files
committed
remove code duplication
1 parent 145303e commit f66e914

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
7575
private final View mView;
7676
private final AccessibilityLinks mAccessibilityLinks;
7777
private final AccessibilityLinks mAccessibilitySpans;
78-
// private final TtsSpan.MoneyBuilder mSpanned;
7978

8079
private Handler mHandler;
8180

@@ -234,8 +233,6 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
234233
final String accessibilityHint = (String) host.getTag(R.id.accessibility_hint);
235234
if (accessibilityRole != null) {
236235
setRole(info, accessibilityRole, host.getContext());
237-
info.setHeading(true);
238-
info.setRoleDescription("heading");
239236
}
240237

241238
if (accessibilityHint != null) {
@@ -595,15 +592,13 @@ protected void onPopulateNodeForVirtualView(
595592
if (ttsSpan == null) {
596593
return;
597594
}
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);
607602
}
608603

609604
private Rect getBoundsInParent(AccessibilityLinks.AccessibleLink accessibleLink) {
@@ -684,15 +679,14 @@ public AccessibilityLinks(ReactSpan[] spans, Spannable text) {
684679
}
685680

686681
final AccessibleLink link = new AccessibleLink();
682+
link.description = text.subSequence(start, end).toString();
687683
if (span instanceof ReactTtsSpan) {
688684
link.span = span;
689685
SpannableString spannableDescription = new SpannableString(text.subSequence(start, end));
690-
link.description = spannableDescription.toString();
691686
link.start = spannableDescription.getSpanStart(span);
692687
link.end = spannableDescription.getSpanEnd(span);
693688
}
694689
if (span instanceof ClickableSpan) {
695-
link.description = text.subSequence(start, end).toString();
696690
link.start = start;
697691
link.end = end;
698692
}

0 commit comments

Comments
 (0)