Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev

This commit is contained in:
Svet Ganov
2014-12-10 19:35:03 +00:00
committed by Android (Google) Code Review

View File

@@ -3421,7 +3421,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
return false; return false;
} }
// Windows are ordered in z order so start from the botton and find // Windows are ordered in z order so start from the bottom and find
// the window of interest. After that all windows that cover it should // the window of interest. After that all windows that cover it should
// be subtracted from the resulting region. Note that for accessibility // be subtracted from the resulting region. Note that for accessibility
// we are returning only interactive windows. // we are returning only interactive windows.
@@ -3439,7 +3439,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
windowInteractiveRegion = outRegion; windowInteractiveRegion = outRegion;
continue; continue;
} }
} else { } else if (currentWindow.getType()
!= AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY) {
Rect currentWindowBounds = mTempRect; Rect currentWindowBounds = mTempRect;
currentWindow.getBoundsInScreen(currentWindowBounds); currentWindow.getBoundsInScreen(currentWindowBounds);
if (windowInteractiveRegion.op(currentWindowBounds, Region.Op.DIFFERENCE)) { if (windowInteractiveRegion.op(currentWindowBounds, Region.Op.DIFFERENCE)) {