diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-12-10 19:43:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-10 19:43:33 +0000 |
| commit | a3bc48c863f69bc048cafbae1e8ff53d53ac6b8e (patch) | |
| tree | 3e171bdae890038d6ad4d2932eda5695e5e36133 | |
| parent | 1032dac1f80cb46b796ab4fe31eb1139cabdd8c9 (diff) | |
| parent | a706c9079a60531d79a3f32f263c37f386229564 (diff) | |
| download | frameworks_base-a3bc48c863f69bc048cafbae1e8ff53d53ac6b8e.zip frameworks_base-a3bc48c863f69bc048cafbae1e8ff53d53ac6b8e.tar.gz frameworks_base-a3bc48c863f69bc048cafbae1e8ff53d53ac6b8e.tar.bz2 | |
am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev
automerge: a706c90
* commit 'a706c9079a60531d79a3f32f263c37f386229564':
Ignore accessibility overlay when computing window's interactive region.
| -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)) { |