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

[a11y] Support TalkBack reading by word, character, and paragraph #17626

Merged
merged 13 commits into from
Apr 16, 2020
Merged

[a11y] Support TalkBack reading by word, character, and paragraph #17626

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f5f35d
[a11y] support Android navigation by word, character, etc
jonahwilliams Apr 10, 2020
950f148
remove more changes
jonahwilliams Apr 10, 2020
ac31470
start working on tests
jonahwilliams Apr 10, 2020
ab07a63
add some unit tests, yayy
jonahwilliams Apr 11, 2020
d3b0a73
format
jonahwilliams Apr 11, 2020
8de4366
revert run_test changes
jonahwilliams Apr 11, 2020
5383757
Add missing license header
jonahwilliams Apr 11, 2020
460a576
Merge branch 'master' of github.com:flutter/engine into fix_navigation
jonahwilliams Apr 11, 2020
67c0d09
Update AccessibilityBridgeTest.java
jonahwilliams Apr 11, 2020
6e6ec2e
Update shell/platform/android/io/flutter/view/AccessibilityBridge.java
jonahwilliams Apr 12, 2020
f2596ac
add comment to embedding
jonahwilliams Apr 15, 2020
9750752
Merge branch 'master' of github.com:flutter/engine into fix_navigation
jonahwilliams Apr 15, 2020
a8caf1b
Update platform_view_android.cc
jonahwilliams Apr 16, 2020
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
13 changes: 6 additions & 7 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 @@ -739,6 +739,12 @@ && shouldSetCollectionInfo(semanticsNode)) {
result.setLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}

if (semanticsNode.hasFlag(Flag.IS_TEXT_FIELD)) {
result.setText(semanticsNode.getValueLabelHint());
} else {
result.setContentDescription(semanticsNode.getValueLabelHint());
}

boolean hasCheckedState = semanticsNode.hasFlag(Flag.HAS_CHECKED_STATE);
boolean hasToggledState = semanticsNode.hasFlag(Flag.HAS_TOGGLED_STATE);
if (BuildConfig.DEBUG && (hasCheckedState && hasToggledState)) {
Expand All @@ -747,7 +753,6 @@ && shouldSetCollectionInfo(semanticsNode)) {
result.setCheckable(hasCheckedState || hasToggledState);
if (hasCheckedState) {
result.setChecked(semanticsNode.hasFlag(Flag.IS_CHECKED));
result.setContentDescription(semanticsNode.getValueLabelHint());
if (semanticsNode.hasFlag(Flag.IS_IN_MUTUALLY_EXCLUSIVE_GROUP)) {
result.setClassName("android.widget.RadioButton");
} else {
Expand All @@ -756,13 +761,7 @@ && shouldSetCollectionInfo(semanticsNode)) {
} else if (hasToggledState) {
result.setChecked(semanticsNode.hasFlag(Flag.IS_TOGGLED));
result.setClassName("android.widget.Switch");
result.setContentDescription(semanticsNode.getValueLabelHint());
} else if (!semanticsNode.hasFlag(Flag.SCOPES_ROUTE)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change now make SemanticsNodes that are scoping a route and have a label focusable?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll update the condition so we don't apply it to those nodes, thanks for jogging my memory a bit on the context

// Setting the text directly instead of the content description
// will replace the "checked" or "not-checked" label.
result.setText(semanticsNode.getValueLabelHint());
}

result.setSelected(semanticsNode.hasFlag(Flag.IS_SELECTED));

// Heading support
Expand Down