Skip to content

Commit

Permalink
Make Accessibility Label Nullable
Browse files Browse the repository at this point in the history
Summary:
After chatting with Brett Lavalla on D14791043 we determined that on Android it makes sense to have a text span with an accessibility role but *without* an accessibility description.

This diff changes the `AccessibleClickSpan` class to reflect this. In this diff I change all `accessibilityDescription` fields to have a `Nullable` annotation with the exception of the `setAccessibilityDescription` method (I think it's sensible to avoid having the function become a no-op).

Reviewed By: usikder

Differential Revision: D14792206

fbshipit-source-id: 7d2da9c5b83fac54e078b6ec3e234ad2750fc012
  • Loading branch information
Nicholas Yan authored and facebook-github-bot committed Apr 5, 2019
1 parent 0e86898 commit 418066c
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
* want to set the accessibility label to the corresponding plurals resource.
*/
public abstract class AccessibleClickableSpan extends ClickableSpan {
private String mAccessibilityDescription;
private @Nullable String mAccessibilityDescription;
@AccessibilityRole.AccessibilityRoleType @Nullable private String mAccessibilityRole;

public String getAccessibilityDescription() {
public @Nullable String getAccessibilityDescription() {
return mAccessibilityDescription;
}

Expand All @@ -49,12 +49,12 @@ public void setAccessibilityRole(
mAccessibilityRole = accessibilityRole;
}

public AccessibleClickableSpan(String accessibilityDescription) {
public AccessibleClickableSpan(@Nullable String accessibilityDescription) {
this(accessibilityDescription, null);
}

public AccessibleClickableSpan(
String accessibilityDescription,
@Nullable String accessibilityDescription,
@Nullable @AccessibilityRole.AccessibilityRoleType String accessibilityRole) {
super();
mAccessibilityDescription = accessibilityDescription;
Expand Down

0 comments on commit 418066c

Please sign in to comment.