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

Commit 0e1531fc authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Expose a11y overlay window titles to a11y services" into pi-dev am: 214a8a95 

am: 721a07a6

Change-Id: Id2820840e77a43999dedc549b2db6bb22066ad5b
parents 452a4739 721a07a6

services/core/java/com/android/server/wm/WindowState.java

+7 −3
Original line number Diff line number Diff line
@@ -3865,9 +3865,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        windowInfo.title = mAttrs.accessibilityTitle;

        // Panel windows have no public way to set the a11y title directly. Use the

        // regular title as a fallback.

        if (TextUtils.isEmpty(windowInfo.title)

                && (mAttrs.type >= WindowManager.LayoutParams.FIRST_SUB_WINDOW)

                && (mAttrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW)) {

        final boolean isPanelWindow = (mAttrs.type >= WindowManager.LayoutParams.FIRST_SUB_WINDOW)

                && (mAttrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW);

        // Accessibility overlays should have titles that work for accessibility, and can't set

        // the a11y title themselves.

        final boolean isAccessibilityOverlay =

                windowInfo.type == WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;

        if (TextUtils.isEmpty(windowInfo.title) && (isPanelWindow || isAccessibilityOverlay)) {

            windowInfo.title = mAttrs.getTitle();

        }

        windowInfo.accessibilityIdOfAnchor = mAttrs.accessibilityIdOfAnchor;