Merge "Fix focusable a11y overlay obstructing introspection" (b7bf1cfa) · Commits · e / os / android_frameworks_base

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

+24 −22

Original line number	Original line	Diff line number	Diff line
	@@ -1102,14 +1102,14 @@ final class AccessibilityController {
	}		}
	}		}

			if (windowState.mAttrs.type !=
			WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {

	// Account for the space this window takes if the window		// Account for the space this window takes if the window
	// is not an accessibility overlay which does not change		// is not an accessibility overlay which does not change
	// the reported windows.		// the reported windows.
	if (windowState.mAttrs.type !=
	WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {
	unaccountedSpace.op(boundsInScreen, unaccountedSpace,		unaccountedSpace.op(boundsInScreen, unaccountedSpace,
	Region.Op.REVERSE_DIFFERENCE);		Region.Op.REVERSE_DIFFERENCE);
	}

	// If a window is modal it prevents other windows from being touched		// If a window is modal it prevents other windows from being touched
	if ((flags & (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE		if ((flags & (WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
	@@ -1131,6 +1131,8 @@ final class AccessibilityController {
	break;		break;
	}		}
	}		}
			}

	// We figured out what is touchable for the entire screen - done.		// We figured out what is touchable for the entire screen - done.
	if (unaccountedSpace.isEmpty()) {		if (unaccountedSpace.isEmpty()) {
	break;		break;