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

Merge "Fixing the accessibility text traversal in extend mode." into jb-mr2-dev

Browse Source
This commit is contained in:
Svetoslav
2013-05-14 17:39:35 +00:00
committed by Android (Google) Code Review
parent 4f88ff48ee abad55d860
commit c0a979ce30
3 changed files with 26 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/java/android/view/View.java
View File

@ -7069,7 +7069,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
final boolean extendSelection = arguments.getBoolean(
AccessibilityNodeInfo.ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN);
return nextAtGranularity(granularity, extendSelection);
return traverseAtGranularity(granularity, true, extendSelection);
}
} break;
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
@ -7078,7 +7078,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
final boolean extendSelection = arguments.getBoolean(
AccessibilityNodeInfo.ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN);
return previousAtGranularity(granularity, extendSelection);
return traverseAtGranularity(granularity, false, extendSelection);
}
} break;
case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
@ -7103,7 +7103,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
return false;
}
private boolean nextAtGranularity(int granularity, boolean extendSelection) {
private boolean traverseAtGranularity(int granularity, boolean forward,
boolean extendSelection) {
CharSequence text = getIterableTextForAccessibility();
if (text == null || text.length() == 0) {
return false;
@ -7114,60 +7115,29 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
int current = getAccessibilitySelectionEnd();
if (current == ACCESSIBILITY_CURSOR_POSITION_UNDEFINED) {
current = 0;
current = forward ? 0 : text.length();
}
final int[] range = iterator.following(current);
final int[] range = forward ? iterator.following(current) : iterator.preceding(current);
if (range == null) {
return false;
}
final int start = range[0];
final int end = range[1];
final int segmentStart = range[0];
final int segmentEnd = range[1];
int selectionStart;
int selectionEnd;
if (extendSelection && isAccessibilitySelectionExtendable()) {
int selectionStart = getAccessibilitySelectionStart();
selectionStart = getAccessibilitySelectionStart();
if (selectionStart == ACCESSIBILITY_CURSOR_POSITION_UNDEFINED) {
selectionStart = start;
selectionStart = forward ? segmentStart : segmentEnd;
}
setAccessibilitySelection(selectionStart, end);
selectionEnd = forward ? segmentEnd : segmentStart;
} else {
setAccessibilitySelection(end, end);
selectionStart = selectionEnd= forward ? segmentEnd : segmentStart;
}
sendViewTextTraversedAtGranularityEvent(
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
granularity, start, end);
return true;
}
private boolean previousAtGranularity(int granularity, boolean extendSelection) {
CharSequence text = getIterableTextForAccessibility();
if (text == null || text.length() == 0) {
return false;
}
TextSegmentIterator iterator = getIteratorForGranularity(granularity);
if (iterator == null) {
return false;
}
int current = getAccessibilitySelectionStart();
if (current == ACCESSIBILITY_CURSOR_POSITION_UNDEFINED) {
current = text.length();
}
final int[] range = iterator.preceding(current);
if (range == null) {
return false;
}
final int start = range[0];
final int end = range[1];
if (extendSelection && isAccessibilitySelectionExtendable()) {
int selectionEnd = getAccessibilitySelectionEnd();
if (selectionEnd == ACCESSIBILITY_CURSOR_POSITION_UNDEFINED) {
selectionEnd = end;
}
setAccessibilitySelection(start, selectionEnd);
} else {
setAccessibilitySelection(start, start);
}
sendViewTextTraversedAtGranularityEvent(
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY,
granularity, start, end);
setAccessibilitySelection(selectionStart, selectionEnd);
final int action = forward ? AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY
: AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY;
sendViewTextTraversedAtGranularityEvent(action, granularity, segmentStart, segmentEnd);
return true;
}

2
core/java/android/view/accessibility/AccessibilityEvent.java
View File

@ -1248,7 +1248,7 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
if (eventTypeCount > 0) {
builder.append(", ");
}
builder.append("TYPE_CURRENT_AT_GRANULARITY_MOVEMENT_CHANGED");
builder.append("TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY");
eventTypeCount++;
} break;
case TYPE_GESTURE_DETECTION_START: {

8
core/java/android/widget/TextView.java
View File

@ -8722,8 +8722,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
&& getAccessibilitySelectionEnd() == end) {
return;
}
// Hide all selection controllers used for adjusting selection
// since we are doing so explicitlty by other means and these
// controllers interact with how selection behaves.
if (mEditor != null) {
mEditor.hideControllers();
}
CharSequence text = getIterableTextForAccessibility();
if (start >= 0 && start <= end && end <= text.length()) {
if (Math.min(start, end) >= 0 && Math.max(start, end) <= text.length()) {
Selection.setSelection((Spannable) text, start, end);
} else {
Selection.removeSelection((Spannable) text);