Merge "Don't ignore accessibility overlays during visibility computation" into lmp-mr1-dev

This commit is contained in:
Alan Viverette
2014-11-18 21:48:11 +00:00
committed by Android (Google) Code Review

View File

@@ -992,12 +992,6 @@ final class AccessibilityController {
continue;
}
// If the window is an accessibility overlay - ignore.
if (windowState.mAttrs.type ==
WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {
continue;
}
// Compute the bounds in the screen.
final Rect boundsInScreen = mTempRect;
computeWindowBoundsInScreen(windowState, boundsInScreen);
@@ -1018,8 +1012,14 @@ final class AccessibilityController {
}
}
unaccountedSpace.op(boundsInScreen, unaccountedSpace,
Region.Op.REVERSE_DIFFERENCE);
// Account for the space this window takes if the window
// is not an accessibility overlay which does not change
// the reported windows.
if (windowState.mAttrs.type !=
WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {
unaccountedSpace.op(boundsInScreen, unaccountedSpace,
Region.Op.REVERSE_DIFFERENCE);
}
// We figured out what is touchable for the entire screen - done.
if (unaccountedSpace.isEmpty()) {