Merge "Accessibility focus should not clear selection when taken away." into jb-dev
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9f5613e..8330193 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6279,8 +6279,6 @@
invalidate();
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
notifyAccessibilityStateChanged();
- // Clear the text navigation state.
- setAccessibilityCursorPosition(ACCESSIBILITY_CURSOR_POSITION_UNDEFINED);
}
// Clear the global reference of accessibility focus if this
// view or any of its descendants had accessibility focus.
@@ -6327,7 +6325,6 @@
void clearAccessibilityFocusNoCallbacks() {
if ((mPrivateFlags2 & ACCESSIBILITY_FOCUSED) != 0) {
mPrivateFlags2 &= ~ACCESSIBILITY_FOCUSED;
- setAccessibilityCursorPosition(ACCESSIBILITY_CURSOR_POSITION_UNDEFINED);
invalidate();
}
}