diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-12-10 19:35:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-10 19:35:05 +0000 |
| commit | e39fc96c04a09a58acb2547a2066e0662791a69b (patch) | |
| tree | 8a6fa3e16d81ab2722b8ac6e3222ec1a3d129de2 | |
| parent | 596d4e7230ae1858aaafbae7987e46d65181f1bd (diff) | |
| parent | 12b7328c0b7f83a233d9387eaa66d1a0ed403724 (diff) | |
| download | frameworks_base-e39fc96c04a09a58acb2547a2066e0662791a69b.zip frameworks_base-e39fc96c04a09a58acb2547a2066e0662791a69b.tar.gz frameworks_base-e39fc96c04a09a58acb2547a2066e0662791a69b.tar.bz2 | |
Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 89aebe8..63a0cf6 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -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)) { |