Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a1d65b7 authored by Svetoslav's avatar Svetoslav Committed by android-build-merger
Browse files

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

automerge: cd2ed4e6

* commit 'cd2ed4e6':
  Accessibility: Sometimes cannot interact with nav bar items.
parents 166aa686 cd2ed4e6

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -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);
@@ -3257,7 +3254,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;

                }