wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 919279 - Add some virtual accessibility nodes to GeckoAccessibility in order to handle when the user enters the view forward or backward. r=eitan

Browse Source
This commit is contained in:
Frédéric Wang 2014-11-13 10:57:00 +01:00
parent 80eb9d983f
commit d88830cc31
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mobile/android/base/GeckoAccessibility.java
View File

@ -34,9 +34,11 @@ import com.googlecode.eyesfree.braille.selfbraille.WriteData;
public class GeckoAccessibility {
private static final String LOGTAG = "GeckoAccessibility";
private static final int VIRTUAL_CURSOR_PREVIOUS = 1;
private static final int VIRTUAL_CURSOR_POSITION = 2;
private static final int VIRTUAL_CURSOR_NEXT = 3;
private static final int VIRTUAL_ENTRY_POINT_BEFORE = 1;
private static final int VIRTUAL_CURSOR_PREVIOUS = 2;
private static final int VIRTUAL_CURSOR_POSITION = 3;
private static final int VIRTUAL_CURSOR_NEXT = 4;
private static final int VIRTUAL_ENTRY_POINT_AFTER = 5;
private static boolean sEnabled;
// Used to store the JSON message and populate the event later in the code path.
@ -296,11 +298,13 @@ public class GeckoAccessibility {
@Override
public AccessibilityNodeProvider getAccessibilityNodeProvider(final View host) {
if (mAccessibilityNodeProvider == null)
// The accessibility node structure for web content consists of 3 LayerView child nodes:
// 1. VIRTUAL_CURSOR_PREVIOUS: Represents the virtual cursor position that is previous to the
// The accessibility node structure for web content consists of 5 LayerView child nodes:
// 1. VIRTUAL_ENTRY_POINT_BEFORE: Represents the entry point before the LayerView.
// 2. VIRTUAL_CURSOR_PREVIOUS: Represents the virtual cursor position that is previous to the
// current one.
// 2. VIRTUAL_CURSOR_POSITION: Represents the current position of the virtual cursor.
// 3. VIRTUAL_CURSOR_NEXT: Represents the next virtual cursor position.
// 3. VIRTUAL_CURSOR_POSITION: Represents the current position of the virtual cursor.
// 4. VIRTUAL_CURSOR_NEXT: Represents the next virtual cursor position.
// 5. VIRTUAL_ENTRY_POINT_AFTER: Represents the entry point after the LayerView.
mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
@Override
public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualDescendantId) {
@ -312,9 +316,11 @@ public class GeckoAccessibility {
case View.NO_ID:
// This is the parent LayerView node, populate it with children.
onInitializeAccessibilityNodeInfo(host, info);
info.addChild(host, VIRTUAL_ENTRY_POINT_BEFORE);
info.addChild(host, VIRTUAL_CURSOR_PREVIOUS);
info.addChild(host, VIRTUAL_CURSOR_POSITION);
info.addChild(host, VIRTUAL_CURSOR_NEXT);
info.addChild(host, VIRTUAL_ENTRY_POINT_AFTER);
break;
default:
info.setParent(host);
@ -342,6 +348,7 @@ public class GeckoAccessibility {
// The accessibility focus is permanently on the middle node, VIRTUAL_CURSOR_POSITION.
// When accessibility focus is requested on one of its siblings we move the virtual cursor
// either forward or backward depending on which sibling was selected.
// When we enter the view forward or backward we just ask Gecko to get focus, keeping the current position.
switch (virtualViewId) {
case VIRTUAL_CURSOR_PREVIOUS:
@ -352,6 +359,10 @@ public class GeckoAccessibility {
GeckoAppShell.
sendEventToGecko(GeckoEvent.createBroadcastEvent("Accessibility:NextObject", null));
return true;
case VIRTUAL_ENTRY_POINT_BEFORE:
case VIRTUAL_ENTRY_POINT_AFTER:
GeckoAppShell.
sendEventToGecko(GeckoEvent.createBroadcastEvent("Accessibility:Focus", "true"));
default:
break;
}