Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e

Browse Source 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
This commit is contained in:
Svetoslav
2015-01-23 23:31:38 +00:00
committed by android-build-merger
parent 9027d7355e db1983b3f4
commit cd2ed4e64c
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -765,16 +765,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
} }
/** /**
* Gets the bounds of the active window. * Gets the bounds of a window.
* *
* @param outBounds The output to which to write the bounds. * @param outBounds The output to which to write the bounds.
*/ */
boolean getActiveWindowBounds(Rect outBounds) { boolean getWindowBounds(int windowId, Rect outBounds) {
// TODO: This should be refactored to work with accessibility
// focus in multiple windows.
IBinder token; IBinder token;
synchronized (mLock) { synchronized (mLock) {
final int windowId = mSecurityPolicy.mActiveWindowId;
token = mGlobalWindowTokens.get(windowId); token = mGlobalWindowTokens.get(windowId);
if (token == null) { if (token == null) {
token = getCurrentUserStateLocked().mWindowTokens.get(windowId); token = getCurrentUserStateLocked().mWindowTokens.get(windowId);
@@ -3255,7 +3252,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
// Make sure the point is within the window. // Make sure the point is within the window.
Rect windowBounds = mTempRect; Rect windowBounds = mTempRect;
getActiveWindowBounds(windowBounds); getWindowBounds(focus.getWindowId(), windowBounds);
if (!windowBounds.contains(point.x, point.y)) { if (!windowBounds.contains(point.x, point.y)) {
return false; return false;
} }