Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix action list comparisons in AccessibilityUtil.java #315

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix action list comparisons in AccessibilityUtil.java #315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions core/src/main/java/com/facebook/testing/screenshot/layouthierarchy/AccessibilityUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -344,24 +345,29 @@ public static boolean isTopLevelScrollItem(
return true;
}

final List actionList = node.getActionList();
if (actionList.contains(AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD)
|| actionList.contains(AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD)) {
return true;
final List<AccessibilityNodeInfoCompat.AccessibilityActionCompat> actionList = node.getActionList();
final HashSet<Integer> actionIds = new HashSet<>();
actionIds.add(AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD);
actionIds.add(AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD);

for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : actionList) {
if (actionIds.contains(action.getId())) {
return true;
}
}

// Top-level items in a scrolling pager are actually two levels down since the first
// level items in pagers are the pages themselves.
View grandparent = (View) ViewCompat.getParentForAccessibility(parent);
if (grandparent != null && getRole(grandparent) == AccessibilityRole.PAGER) {
if (grandparent != null && getRole(grandparent) == AccessibilityUtil.AccessibilityRole.PAGER) {
return true;
}

AccessibilityRole parentRole = getRole(parent);
return parentRole == AccessibilityRole.LIST
|| parentRole == AccessibilityRole.GRID
|| parentRole == AccessibilityRole.SCROLL_VIEW
|| parentRole == AccessibilityRole.HORIZONTAL_SCROLL_VIEW;
AccessibilityUtil.AccessibilityRole parentRole = getRole(parent);
return parentRole == AccessibilityUtil.AccessibilityRole.LIST
|| parentRole == AccessibilityUtil.AccessibilityRole.GRID
|| parentRole == AccessibilityUtil.AccessibilityRole.SCROLL_VIEW
|| parentRole == AccessibilityUtil.AccessibilityRole.HORIZONTAL_SCROLL_VIEW;
}

/**
Expand All @@ -381,10 +387,18 @@ public static boolean isActionableForAccessibility(@Nullable AccessibilityNodeIn
return true;
}

final List actionList = node.getActionList();
return actionList.contains(AccessibilityNodeInfoCompat.ACTION_CLICK)
|| actionList.contains(AccessibilityNodeInfoCompat.ACTION_LONG_CLICK)
|| actionList.contains(AccessibilityNodeInfoCompat.ACTION_FOCUS);
final List<AccessibilityNodeInfoCompat.AccessibilityActionCompat> actionList = node.getActionList();
final HashSet<Integer> accessibilityActionIds = new HashSet<>();
accessibilityActionIds.add(AccessibilityNodeInfoCompat.ACTION_CLICK);
accessibilityActionIds.add(AccessibilityNodeInfoCompat.ACTION_LONG_CLICK);
accessibilityActionIds.add(AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS);

for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : actionList) {
if (accessibilityActionIds.contains(action.getId())) {
return true;
}
}
return false;
}

/**
Expand Down