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

Commit 86bbf705 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Settings crash after enabling TalkBack accessibility." into jb-dev

parents 2e6f9be5 ee33ad24

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -432,9 +432,11 @@ public class AccessibilityNodeInfo implements Parcelable { 
        final int rootAccessibilityViewId =

            (root != null) ? root.getAccessibilityViewId() : UNDEFINED;

        mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId);

        if (root != null) {

            mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta();

            mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta();

        }

    }



    /**

     * Find the view that has the specified focus type. The search starts from

services/java/com/android/server/accessibility/AccessibilityInputFilter.java

+3 −1
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ public class AccessibilityInputFilter extends InputFilter { 
    }



    public void onAccessibilityEvent(AccessibilityEvent event) {

        if (mTouchExplorer != null) {

            mTouchExplorer.onAccessibilityEvent(event);

        }

    }

}