Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let TextView clear accessibility selection index" into mnc-dev

Browse Source
This commit is contained in:
Maxim Bogatov
2015-06-30 18:45:46 +00:00
committed by Android (Google) Code Review
parent 3acd16032c 1fa819b337
commit 7a2e4b8f80
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8837,12 +8837,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE
| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH
| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE); | AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE);
info.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
} }
if (isFocused()) { if (isFocused()) {
if (canSelectText()) {
info.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
}
if (canCopy()) { if (canCopy()) {
info.addAction(AccessibilityNodeInfo.ACTION_COPY); info.addAction(AccessibilityNodeInfo.ACTION_COPY);
} }
@@ -8931,30 +8929,28 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
} return false; } return false;
case AccessibilityNodeInfo.ACTION_SET_SELECTION: { case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
if (isFocused() && canSelectText()) { ensureIterableTextForAccessibilitySelectable();
ensureIterableTextForAccessibilitySelectable(); CharSequence text = getIterableTextForAccessibility();
CharSequence text = getIterableTextForAccessibility(); if (text == null) {
if (text == null) { return false;
return false; }
final int start = (arguments != null) ? arguments.getInt(
AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, -1) : -1;
final int end = (arguments != null) ? arguments.getInt(
AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, -1) : -1;
if ((getSelectionStart() != start || getSelectionEnd() != end)) {
// No arguments clears the selection.
if (start == end && end == -1) {
Selection.removeSelection((Spannable) text);
return true;
} }
final int start = (arguments != null) ? arguments.getInt( if (start >= 0 && start <= end && end <= text.length()) {
AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, -1) : -1; Selection.setSelection((Spannable) text, start, end);
final int end = (arguments != null) ? arguments.getInt( // Make sure selection mode is engaged.
AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, -1) : -1; if (mEditor != null) {
if ((getSelectionStart() != start || getSelectionEnd() != end)) { mEditor.startSelectionActionMode();
// No arguments clears the selection.
if (start == end && end == -1) {
Selection.removeSelection((Spannable) text);
return true;
}
if (start >= 0 && start <= end && end <= text.length()) {
Selection.setSelection((Spannable) text, start, end);
// Make sure selection mode is engaged.
if (mEditor != null) {
mEditor.startSelectionActionMode();
}
return true;
} }
return true;
} }
} }
} return false; } return false;