drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-06-14 17:19:54 -07:00
committed by Android (Google) Code Review
parent 0777558f03 8bab6de6e2
commit 2657a59f54
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/AccessibilityInjector.java
View File

@ -483,15 +483,19 @@ class AccessibilityInjector {
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY:
if (arguments != null) {
final int granularity = arguments.getInt( final int granularity = arguments.getInt(
AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT); AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
mAccessibilityJSONObject.accumulate("granularity", granularity); mAccessibilityJSONObject.accumulate("granularity", granularity);
}
break; break;
case AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT: case AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT:
case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT: case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT:
if (arguments != null) {
final String element = arguments.getString( final String element = arguments.getString(
AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING); AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING);
mAccessibilityJSONObject.accumulate("element", element); mAccessibilityJSONObject.accumulate("element", element);
}
break; break;
} }
} catch (JSONException e) { } catch (JSONException e) {

16
core/java/android/webkit/AccessibilityInjectorFallback.java
View File

@ -272,11 +272,19 @@ class AccessibilityInjectorFallback {
boolean performAccessibilityAction(int action, Bundle arguments) { boolean performAccessibilityAction(int action, Bundle arguments) {
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
final int direction = getDirectionForAction(action); final int direction = getDirectionForAction(action);
final int axis = getAxisForGranularity(arguments.getInt( final int axis = getAxisForGranularity(arguments.getInt(
AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT)); AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT));
return traverseGivenAxis(direction, axis, true, null); return traverseGivenAxis(direction, axis, true, null);
}
case AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT:
case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT: {
final int direction = getDirectionForAction(action);
// TODO: Add support for moving by object.
final int axis = NAVIGATION_AXIS_SENTENCE;
return traverseGivenAxis(direction, axis, true, null);
}
default: default:
return false; return false;
} }
@ -291,8 +299,10 @@ class AccessibilityInjectorFallback {
*/ */
private static int getDirectionForAction(int action) { private static int getDirectionForAction(int action) {
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT:
case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
return NAVIGATION_DIRECTION_FORWARD; return NAVIGATION_DIRECTION_FORWARD;
case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT:
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY:
return NAVIGATION_DIRECTION_BACKWARD; return NAVIGATION_DIRECTION_BACKWARD;
default: default:
@ -316,8 +326,8 @@ class AccessibilityInjectorFallback {
case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE: case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE:
return NAVIGATION_AXIS_SENTENCE; return NAVIGATION_AXIS_SENTENCE;
case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH: case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH:
// TODO: Figure out what nextSibling() actually means. // TODO: This should map to object once we implement it.
return NAVIGATION_AXIS_SIBLING; return NAVIGATION_AXIS_SENTENCE;
case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE: case AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE:
return NAVIGATION_AXIS_DOCUMENT; return NAVIGATION_AXIS_DOCUMENT;
default: default: