Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reland "Android a11y bridge sets importantness" #44589

Merged
auto-submit merged 2 commits into from
Aug 10, 2023
Merged

Reland "Android a11y bridge sets importantness" #44589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa716cf
Reland "Android a11y bridge sets importantness"
chunhtai Aug 10, 2023
9c71af0
Add version guard
chunhtai Aug 10, 2023
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
Prev Previous commit
Add version guard
  • Loading branch information
@chunhtai
chunhtai committed Aug 10, 2023
commit 9c71af0a13bbb1e51c7ab54335031965c344ac8c
8 changes: 6 additions & 2 deletions shell/platform/android/io/flutter/view/AccessibilityBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,9 @@ public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
if (flutterSemanticsTree.containsKey(ROOT_NODE_ID)) {
result.addChild(rootAccessibilityView, ROOT_NODE_ID);
}
result.setImportantForAccessibility(false);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
result.setImportantForAccessibility(false);
}
return result;
}

Expand Down Expand Up @@ -662,7 +664,9 @@ public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {

// Accessibility Scanner uses isImportantForAccessibility to decide whether to check
// or skip this node.
result.setImportantForAccessibility(isImportant(semanticsNode));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
result.setImportantForAccessibility(isImportant(semanticsNode));
}

// Work around for https://github.com/flutter/flutter/issues/2101
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/android/test/io/flutter/view/AccessibilityBridgeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ public void itSetsTraversalAfter() {
verify(mockNodeInfo2, times(1)).setTraversalAfter(eq(mockRootView), eq(1));
}

@TargetApi(24)
@Test
public void itSetsRootViewNotImportantForAccessibility() {
AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
Expand Down Expand Up @@ -349,6 +350,7 @@ public void itSetsRootViewNotImportantForAccessibility() {
verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(false));
}

@TargetApi(24)
@Test
public void itSetsNodeImportantForAccessibilityIfItHasContent() {
AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
Expand Down Expand Up @@ -378,6 +380,7 @@ public void itSetsNodeImportantForAccessibilityIfItHasContent() {
verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(true));
}

@TargetApi(24)
@Test
public void itSetsNodeImportantForAccessibilityIfItHasActions() {
AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
Expand Down Expand Up @@ -407,6 +410,7 @@ public void itSetsNodeImportantForAccessibilityIfItHasActions() {
verify(mockNodeInfo, times(1)).setImportantForAccessibility(eq(true));
}

@TargetApi(24)
@Test
public void itSetsNodeUnImportantForAccessibilityIfItIsEmpty() {
AccessibilityViewEmbedder mockViewEmbedder = mock(AccessibilityViewEmbedder.class);
Expand Down