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 8f1239d7456..293ff055d07 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -317,7 +317,6 @@ public abstract class BaseViewManager contentDescription = new ArrayList<>(); final ReadableMap accessibilityValue = (ReadableMap) view.getTag(R.id.accessibility_value); if (accessibilityLabel != null) { @@ -352,9 +351,6 @@ public abstract class BaseViewManager 0) { view.setContentDescription(TextUtils.join(", ", contentDescription)); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java index 3e6d1b36b08..1c635887924 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java @@ -225,10 +225,15 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper { super.onInitializeAccessibilityNodeInfo(host, info); final AccessibilityRole accessibilityRole = (AccessibilityRole) host.getTag(R.id.accessibility_role); + final String accessibilityHint = (String) host.getTag(R.id.accessibility_hint); if (accessibilityRole != null) { setRole(info, accessibilityRole, host.getContext()); } + if (accessibilityHint != null) { + info.setTooltipText(accessibilityHint); + } + final Object accessibilityLabelledBy = host.getTag(R.id.labelled_by); if (accessibilityLabelledBy != null) { mAccessibilityLabelledBy =