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

Commit 0a1bb6df authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

AccessibilityNodeInfo for visible views should reported. 

1. AccessibilityNodeInfos for visible views should always
   be reported and the clients should be able to check
   whether that node info is shown to the user. For example,
   focus search may return a node that is not on the screen
   and the accessibility layer may decide to give it focus
   which scroll the source view in the screen.

bug:6421991

Change-Id: Idc1fd8512dda767abe802aacedb0c69582e6fc2a
parent 2551e5a1

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25181,6 +25181,7 @@ package android.view.accessibility { 
    method public boolean isPassword();

    method public boolean isScrollable();

    method public boolean isSelected();

    method public boolean isVisibleToUser();

    method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);

    method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);

    method public static android.view.accessibility.AccessibilityNodeInfo obtain();
@@ -25210,6 +25211,7 @@ package android.view.accessibility { 
    method public void setSource(android.view.View);

    method public void setSource(android.view.View, int);

    method public void setText(java.lang.CharSequence);

    method public void setVisibleToUser(boolean);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int ACTION_ACCESSIBILITY_FOCUS = 64; // 0x40

    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";

core/java/android/view/AccessibilityInteractionController.java

+21 −11
Original line number Diff line number Diff line
@@ -126,6 +126,16 @@ final class AccessibilityInteractionController { 
        }

    }



    private boolean isShown(View view) {

        // The first two checks are made also made by isShown() which

        // however traverses the tree up to the parent to catch that.

        // Therefore, we do some fail fast check to minimize the up

        // tree traversal.

        return (view.mAttachInfo != null

                && view.mAttachInfo.mWindowVisibility == View.VISIBLE

                && view.isShown());

    }



    public void findAccessibilityNodeInfoByAccessibilityIdClientThread(

            long accessibilityNodeId, int interactionId,

            IAccessibilityInteractionConnectionCallback callback, int flags, int interrogatingPid,
@@ -174,7 +184,7 @@ final class AccessibilityInteractionController { 
            } else {

                root = findViewByAccessibilityId(accessibilityViewId);

            }

            if (root != null && root.isDisplayedOnScreen()) {

            if (root != null && isShown(root)) {

                mPrefetcher.prefetchAccessibilityNodeInfos(root, virtualDescendantId, flags, infos);

            }

        } finally {
@@ -236,7 +246,7 @@ final class AccessibilityInteractionController { 
            }

            if (root != null) {

                View target = root.findViewById(viewId);

                if (target != null && target.isDisplayedOnScreen()) {

                if (target != null && isShown(target)) {

                    info = target.createAccessibilityNodeInfo();

                }

            }
@@ -298,7 +308,7 @@ final class AccessibilityInteractionController { 
            } else {

                root = mViewRootImpl.mView;

            }

            if (root != null && root.isDisplayedOnScreen()) {

            if (root != null && isShown(root)) {

                AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider();

                if (provider != null) {

                    infos = provider.findAccessibilityNodeInfosByText(text,
@@ -315,7 +325,7 @@ final class AccessibilityInteractionController { 
                        final int viewCount = foundViews.size();

                        for (int i = 0; i < viewCount; i++) {

                            View foundView = foundViews.get(i);

                            if (foundView.isDisplayedOnScreen()) {

                            if (isShown(foundView)) {

                                provider = foundView.getAccessibilityNodeProvider();

                                if (provider != null) {

                                    List<AccessibilityNodeInfo> infosFromProvider =
@@ -390,7 +400,7 @@ final class AccessibilityInteractionController { 
            } else {

                root = mViewRootImpl.mView;

            }

            if (root != null && root.isDisplayedOnScreen()) {

            if (root != null && isShown(root)) {

                switch (focusType) {

                    case AccessibilityNodeInfo.FOCUS_ACCESSIBILITY: {

                        View host = mViewRootImpl.mAccessibilityFocusedHost;
@@ -411,7 +421,7 @@ final class AccessibilityInteractionController { 
                    case AccessibilityNodeInfo.FOCUS_INPUT: {

                        // Input focus cannot go to virtual views.

                        View target = root.findFocus();

                        if (target != null && target.isDisplayedOnScreen()) {

                        if (target != null && isShown(target)) {

                            focused = target.createAccessibilityNodeInfo();

                        }

                    } break;
@@ -477,7 +487,7 @@ final class AccessibilityInteractionController { 
            } else {

                root = mViewRootImpl.mView;

            }

            if (root != null && root.isDisplayedOnScreen()) {

            if (root != null && isShown(root)) {

                if ((direction & View.FOCUS_ACCESSIBILITY) ==  View.FOCUS_ACCESSIBILITY) {

                    AccessibilityNodeProvider provider = root.getAccessibilityNodeProvider();

                    if (provider != null) {
@@ -565,7 +575,7 @@ final class AccessibilityInteractionController { 
            } else {

                target = mViewRootImpl.mView;

            }

            if (target != null && target.isDisplayedOnScreen()) {

            if (target != null && isShown(target)) {

                AccessibilityNodeProvider provider = target.getAccessibilityNodeProvider();

                if (provider != null) {

                    succeeded = provider.performAction(virtualDescendantId, action,
@@ -590,7 +600,7 @@ final class AccessibilityInteractionController { 
            return null;

        }

        View foundView = root.findViewByAccessibilityId(accessibilityId);

        if (foundView != null && !foundView.isDisplayedOnScreen()) {

        if (foundView != null && !isShown(foundView)) {

            return null;

        }

        return foundView;
@@ -670,7 +680,7 @@ final class AccessibilityInteractionController { 
                        }

                        View child = children.getChildAt(i);

                        if (child.getAccessibilityViewId() != current.getAccessibilityViewId()

                                &&  child.isDisplayedOnScreen()) {

                                &&  isShown(child)) {

                            AccessibilityNodeInfo info = null;

                            AccessibilityNodeProvider provider = child.getAccessibilityNodeProvider();

                            if (provider == null) {
@@ -706,7 +716,7 @@ final class AccessibilityInteractionController { 
                        return;

                    }

                    View child = children.getChildAt(i);

                    if (child.isDisplayedOnScreen()) {

                    if (isShown(child)) {

                        AccessibilityNodeProvider provider = child.getAccessibilityNodeProvider();

                        if (provider == null) {

                            AccessibilityNodeInfo info = child.createAccessibilityNodeInfo();

core/java/android/view/View.java

+54 −6
Original line number Diff line number Diff line
@@ -4656,6 +4656,51 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
        }

    }













    /**













     * Gets the location of this view in screen coordintates.













     *













     * @param outRect The output location













     */













    private void getBoundsOnScreen(Rect outRect) {













        if (mAttachInfo == null) {













            return;













        }

























        RectF position = mAttachInfo.mTmpTransformRect;













        position.setEmpty();

























        if (!hasIdentityMatrix()) {













            getMatrix().mapRect(position);













        }

























        position.offset(mLeft, mRight);

























        ViewParent parent = mParent;













        while (parent instanceof View) {













            View parentView = (View) parent;

























            position.offset(-parentView.mScrollX, -parentView.mScrollY);

























            if (!parentView.hasIdentityMatrix()) {













                parentView.getMatrix().mapRect(position);













            }

























            position.offset(parentView.mLeft, parentView.mTop);

























            parent = parentView.mParent;













        }

























        if (parent instanceof ViewRootImpl) {













            ViewRootImpl viewRootImpl = (ViewRootImpl) parent;













            position.offset(0, -viewRootImpl.mCurScrollY);













        }

























        position.offset(mAttachInfo.mWindowLeft, mAttachInfo.mWindowTop);

























        outRect.set((int) (position.left + 0.5f), (int) (position.top + 0.5f),













                (int) (position.right + 0.5f), (int) (position.bottom + 0.5f));













    }



























    /**















     * @see #onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)















     *









@@ -4666,8 +4711,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal













        getDrawingRect(bounds);















        info.setBoundsInParent(bounds);



























        getGlobalVisibleRect(bounds);













        bounds.offset(mAttachInfo.mWindowLeft, mAttachInfo.mWindowTop);













        getBoundsOnScreen(bounds);















        info.setBoundsInScreen(bounds);





























        if ((mPrivateFlags & IS_ROOT_NAMESPACE) == 0) {









@@ -4677,6 +4721,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal













            }















        }



























        info.setVisibleToUser(isVisibleToUser());



























        info.setPackageName(mContext.getPackageName());















        info.setClassName(View.class.getName());















        info.setContentDescription(getContentDescription());










@@ -4723,11 +4769,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal













    }





























    /**













     * Computes whether this view is visible on the screen.













     * Computes whether this view is visible to the user. Such a view is













     * attached, visible, all its predecessors are visible, it is not clipped













     * entirely by its predecessors, and has an alpha greater than zero.















     *















     * @return Whether the view is visible on the screen.















     */













    boolean isDisplayedOnScreen() {













    private boolean isVisibleToUser() {















        // The first two checks are made also made by isShown() which















        // however traverses the tree up to the parent to catch that.















        // Therefore, we do some fail fast check to minimize the up










@@ -6377,9 +6425,9 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal













    boolean includeForAccessibility() {















        if (mAttachInfo != null) {















            if (!mAttachInfo.mIncludeNotImportantViews) {













                return isImportantForAccessibility() && isDisplayedOnScreen();













                return isImportantForAccessibility();















            } else {













                return isDisplayedOnScreen();













                return true;















            }















        }















        return false;

































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



+27
−0




























Original line number
Diff line number
Diff line








@@ -287,6 +287,8 @@ public class AccessibilityNodeInfo implements Parcelable {





























    private static final int PROPERTY_ACCESSIBILITY_FOCUSED = 0x00000400;





























    private static final int PROPERTY_VISIBLE_TO_USER = 0x00000800;





























    /**















     * Bits that provide the id of a virtual descendant of a view.















     */










@@ -909,6 +911,31 @@ public class AccessibilityNodeInfo implements Parcelable {













        setBooleanProperty(PROPERTY_FOCUSED, focused);















    }





























    /**













     * Sets whether this node is visible to the user.













     *













     * @return Whether the node is visible to the user.













     */













    public boolean isVisibleToUser() {













        return getBooleanProperty(PROPERTY_VISIBLE_TO_USER);













    }



























    /**













     * Sets whether this node is visible to the user.













     * <p>













     *   <strong>Note:</strong> Cannot be called from an













     *   {@link android.accessibilityservice.AccessibilityService}.













     *   This class is made immutable before being delivered to an AccessibilityService.













     * </p>













     *













     * @param visibleToUser Whether the node is visible to the user.













     *













     * @throws IllegalStateException If called from an AccessibilityService.













     */













    public void setVisibleToUser(boolean visibleToUser) {













        setBooleanProperty(PROPERTY_VISIBLE_TO_USER, visibleToUser);













    }





























    /**















     * Gets whether this node is accessibility focused.















     *