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

Commit 840eb10a authored by Sally's avatar Sally
Browse files

Add back a check for node provider when determining accessibility importance 

ag/23011915 removed this check, but this removal means views that
override getAccessibilityNodeProvider may not be included for
accessibility.

Fixes: 323027946
Bug: 323027946
Test: manual with Slides, cts test
Change-Id: I91f72c8d60bda813c8d2740f8a16fb73b2d5f8d8
parent 976207c4

core/java/android/view/View.java

+3 −1
Original line number Diff line number Diff line
@@ -14958,6 +14958,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * {@link #isLongClickable()}, {@link #isContextClickable()},

     * {@link #isScreenReaderFocusable()}, or {@link #isFocusable()}

     * <li>Has an {@link AccessibilityDelegate}

     * <li>Has an {@link AccessibilityNodeProvider}

     * <li>Has an interaction listener, e.g. {@link OnTouchListener},

     * {@link OnKeyListener}, etc.

     * <li>Is an accessibility live region, e.g.
@@ -14990,7 +14991,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }















        return mode == IMPORTANT_FOR_ACCESSIBILITY_YES || isActionableForAccessibility()













                || hasListenersForAccessibility() || mAccessibilityDelegate != null













                || hasListenersForAccessibility() || getAccessibilityNodeProvider() != null













                || getAccessibilityDelegate() != null















                || getAccessibilityLiveRegion() != ACCESSIBILITY_LIVE_REGION_NONE















                || isAccessibilityPane() || isAccessibilityHeading();















    }