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

* commit 'e39fc96c04a09a58acb2547a2066e0662791a69b':
  Ignore accessibility overlay when computing window's interactive region.
This commit is contained in:
Svet Ganov
2014-12-10 19:42:08 +00:00
committed by Android Git Automerger

View File

@@ -3421,7 +3421,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
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
// be subtracted from the resulting region. Note that for accessibility
// we are returning only interactive windows.
@@ -3439,7 +3439,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
windowInteractiveRegion = outRegion;
continue;
}
} else {
} else if (currentWindow.getType()
!= AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY) {
Rect currentWindowBounds = mTempRect;
currentWindow.getBoundsInScreen(currentWindowBounds);
if (windowInteractiveRegion.op(currentWindowBounds, Region.Op.DIFFERENCE)) {