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

Commit a706c907 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s... 

am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev

* commit 'e39fc96c':
  Ignore accessibility overlay when computing window's interactive region.
parents ee501ed8 e39fc96c

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -3421,7 +3421,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                return false;

                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

            // the window of interest. After that all windows that cover it should

            // be subtracted from the resulting region. Note that for accessibility

            // be subtracted from the resulting region. Note that for accessibility

            // we are returning only interactive windows.

            // we are returning only interactive windows.
@@ -3439,7 +3439,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                        windowInteractiveRegion = outRegion;

                        windowInteractiveRegion = outRegion;

                        continue;

                        continue;

                    }

                    }

                } else {

                } else if (currentWindow.getType()

                        != AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY) {

                    Rect currentWindowBounds = mTempRect;

                    Rect currentWindowBounds = mTempRect;

                    currentWindow.getBoundsInScreen(currentWindowBounds);

                    currentWindow.getBoundsInScreen(currentWindowBounds);

                    if (windowInteractiveRegion.op(currentWindowBounds, Region.Op.DIFFERENCE)) {

                    if (windowInteractiveRegion.op(currentWindowBounds, Region.Op.DIFFERENCE)) {