Merge "Accessibility focus should not clear selection when taken away." into jb-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
72d6835c7c
@ -6279,8 +6279,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
|
|||||||
invalidate();
|
invalidate();
|
||||||
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
|
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
|
||||||
notifyAccessibilityStateChanged();
|
notifyAccessibilityStateChanged();
|
||||||
// Clear the text navigation state.
|
|
||||||
setAccessibilityCursorPosition(ACCESSIBILITY_CURSOR_POSITION_UNDEFINED);
|
|
||||||
}
|
}
|
||||||
// Clear the global reference of accessibility focus if this
|
// Clear the global reference of accessibility focus if this
|
||||||
// view or any of its descendants had accessibility focus.
|
// view or any of its descendants had accessibility focus.
|
||||||
@ -6327,7 +6325,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
|
|||||||
void clearAccessibilityFocusNoCallbacks() {
|
void clearAccessibilityFocusNoCallbacks() {
|
||||||
if ((mPrivateFlags2 & ACCESSIBILITY_FOCUSED) != 0) {
|
if ((mPrivateFlags2 & ACCESSIBILITY_FOCUSED) != 0) {
|
||||||
mPrivateFlags2 &= ~ACCESSIBILITY_FOCUSED;
|
mPrivateFlags2 &= ~ACCESSIBILITY_FOCUSED;
|
||||||
setAccessibilityCursorPosition(ACCESSIBILITY_CURSOR_POSITION_UNDEFINED);
|
|
||||||
invalidate();
|
invalidate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user