firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only expose available semantic scroll actions (flutter/engine#4010)

Browse Source 
* Only expose available scroll actions

* formatting

* more formatting
This commit is contained in:
Michael Goderbauer
2017-08-25 16:12:50 -07:00
committed by GitHub
parent ea1bfcbf1f
commit 050b4456fd
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
View File

@@ -111,18 +111,24 @@ class AccessibilityBridge extends AccessibilityNodeProvider {
result.setLongClickable(true);
}
if ((object.actions & SEMANTICS_ACTION_SCROLLABLE) != 0) {
// TODO(ianh): Once we're on SDK v23+, call addAction to
// expose AccessibilityAction.ACTION_SCROLL_LEFT, _RIGHT,
// _UP, and _DOWN when appropriate.
// TODO(ianh): Only include the actions if you can actually scroll that way.
result.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
result.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
result.setScrollable(true);
// This tells Android's a11y to send scroll events when reaching the end of
// the visible viewport of a scrollable.
result.setClassName("android.widget.ScrollView");
// TODO(ianh): Once we're on SDK v23+, call addAction to
// expose AccessibilityAction.ACTION_SCROLL_LEFT, _RIGHT,
// _UP, and _DOWN when appropriate.
if ((object.actions & SEMANTICS_ACTION_SCROLL_RIGHT) != 0
|| (object.actions & SEMANTICS_ACTION_SCROLL_UP) != 0) {
result.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
}
if ((object.actions & SEMANTICS_ACTION_SCROLL_LEFT) != 0
|| (object.actions & SEMANTICS_ACTION_SCROLL_DOWN) != 0) {
result.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
}
}
if ((object.actions & SEMANTICS_ACTION_INCREASE) != 0 || (object.actions & SEMANTICS_ACTION_DECREASE) != 0 ) {
if ((object.actions & SEMANTICS_ACTION_INCREASE) != 0
|| (object.actions & SEMANTICS_ACTION_DECREASE) != 0 ) {
result.setFocusable(true);
result.setClassName("android.widget.SeekBar");
if ((object.actions & SEMANTICS_ACTION_INCREASE) != 0) {