Merge "Make sure focused window is tracked by accessibility even if it is obscured." into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-19 12:35:16 +00:00
committed by Android (Google) Code Review

View File

@@ -1132,7 +1132,7 @@ final class AccessibilityController {
HashSet<Integer> skipRemainingWindowsForTasks = new HashSet<>();
// Iterate until we figure out what is touchable for the entire screen.
for (int i = visibleWindowCount - 1; i >= 0 && !unaccountedSpace.isEmpty(); i--) {
for (int i = visibleWindowCount - 1; i >= 0; i--) {
final WindowState windowState = visibleWindows.valueAt(i);
final Rect boundsInScreen = mTempRect;
@@ -1143,6 +1143,11 @@ final class AccessibilityController {
addPopulatedWindowInfo(windowState, boundsInScreen, windows, addedWindows);
updateUnaccountedSpace(windowState, boundsInScreen, unaccountedSpace,
skipRemainingWindowsForTasks);
focusedWindowAdded |= windowState.isFocused();
}
if (unaccountedSpace.isEmpty() && focusedWindowAdded) {
break;
}
}