From fa6035bda6c606868977179534cb941f26fbdb92 Mon Sep 17 00:00:00 2001 From: "Andrew Chen (Eng)" Date: Wed, 3 Oct 2018 18:20:18 -0700 Subject: [PATCH] Fix accessibility role/label Summary: D10138128 had some shamefully wrong boolean logic to determine whether we should customize the accessibility delegate. Previously, we did it if BOTH the accessibility label AND role were present. We should actually do it if EITHER are present. Reviewed By: mdvacca Differential Revision: D10182135 fbshipit-source-id: 209a8ab43f5869762843fe878cfd59a7b9b5ab1a --- .../facebook/react/uimanager/AccessibilityDelegateUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java index 647b4bf8ef1c87..ca491576bb3a61 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java @@ -72,8 +72,7 @@ public static void setDelegate(final View view) { // if a view already has an accessibility delegate, replacing it could cause problems, // so leave it alone. if (!ViewCompat.hasAccessibilityDelegate(view) && - accessibilityHint != null && - accessibilityRole != null) { + (accessibilityHint != null || accessibilityRole != null)) { ViewCompat.setAccessibilityDelegate( view, new AccessibilityDelegateCompat() {