am b0c1485d: am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility... (16f3e55d) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+21 −25

Original line number	Diff line number	Diff line
		@@ -8837,12 +8837,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		\| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE
		\| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH
		\| AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE);
		info.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
		}

		if (isFocused()) {
		if (canSelectText()) {
		info.addAction(AccessibilityNodeInfo.ACTION_SET_SELECTION);
		}
		if (canCopy()) {
		info.addAction(AccessibilityNodeInfo.ACTION_COPY);
		}
		@@ -8907,7 +8905,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		} return false;
		case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
		if (isFocused() && canSelectText()) {
		ensureIterableTextForAccessibilitySelectable();
		CharSequence text = getIterableTextForAccessibility();
		if (text == null) {
		@@ -8932,7 +8929,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return true;
		}
		}
		}
		} return false;
		case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
		case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {