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

6
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,7 +8929,6 @@ 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) {
@@ -8956,7 +8953,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return true; return true;
} }
} }
}
} return false; } return false;
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: {