Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eab75b9 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 321a56c8: Merge "Clearing accessibility focus of a view did not update the... 

am 321a56c8: Merge "Clearing accessibility focus of a view did not update the global state." into jb-dev

* commit '321a56c8':
  Clearing accessibility focus of a view did not update the global state.
parents 5640e6a9 321a56c8

core/java/android/view/View.java

+9 −9
Original line number Diff line number Diff line
@@ -6196,23 +6196,23 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
     * @hide

     */

    public void clearAccessibilityFocus() {

        ViewRootImpl viewRootImpl = getViewRootImpl();

        if (viewRootImpl != null) {

            View focusHost = viewRootImpl.getAccessibilityFocusedHost();

            if (focusHost != null && focusHost != this

                    && ViewRootImpl.isViewDescendantOf(focusHost, this)) {

                viewRootImpl.setAccessibilityFocusedHost(null);

            }

        }

        if ((mPrivateFlags2 & ACCESSIBILITY_FOCUSED) != 0) {

            mPrivateFlags2 &= ~ACCESSIBILITY_FOCUSED;

            invalidate();

            sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);

            notifyAccessibilityStateChanged();















            // Clear the text navigation state.















            setAccessibilityCursorPosition(-1);















        }













        // Clear the global reference of accessibility focus if this













        // view or any of its descendants had accessibility focus.













        ViewRootImpl viewRootImpl = getViewRootImpl();













        if (viewRootImpl != null) {













            View focusHost = viewRootImpl.getAccessibilityFocusedHost();













            if (focusHost != null && ViewRootImpl.isViewDescendantOf(focusHost, this)) {













                viewRootImpl.setAccessibilityFocusedHost(null);













            }













        }















    }





























    private void requestAccessibilityFocusFromHover() {