Accessibility: Sometimes cannot interact with nav bar items.

automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
This commit is contained in:
Svetoslav
2015-01-23 23:27:34 +00:00
committed by android-build-merger

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.
*/
boolean getActiveWindowBounds(Rect outBounds) {
// TODO: This should be refactored to work with accessibility
// focus in multiple windows.
boolean getWindowBounds(int windowId, Rect outBounds) {
IBinder token;
synchronized (mLock) {
final int windowId = mSecurityPolicy.mActiveWindowId;
token = mGlobalWindowTokens.get(windowId);
if (token == null) {
token = getCurrentUserStateLocked().mWindowTokens.get(windowId);
@@ -3255,7 +3252,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
// Make sure the point is within the window.
Rect windowBounds = mTempRect;
getActiveWindowBounds(windowBounds);
getWindowBounds(focus.getWindowId(), windowBounds);
if (!windowBounds.contains(point.x, point.y)) {
return false;
}