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

Commit 3863a370 authored by Jacky Kao's avatar Jacky Kao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-16249364-Surface Flinger-DSXVCJKDAJ" 

* changes:
  Revert "Uses SF callback windows for the A11yWindowInfo [1/n]"
  Revert "Uses SF callback windows for the A11yWindowInfo [2/n]"
  Revert "Use shellRoot to identify PIP menu window"
  Revert "Apply display transform to window bounds and node bounds"
parents 702c8991 30abc90f

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

+0 −19
Original line number Diff line number Diff line
@@ -667,10 +667,6 @@ public class AccessibilityWindowManager { 
                return null;

            }



            // Don't need to add the embedded hierarchy windows into the accessibility windows list.

            if (mHostEmbeddedMap.size() > 0 && isEmbeddedHierarchyWindowsLocked(windowId)) {

                return null;

            }

            final AccessibilityWindowInfo reportedWindow = AccessibilityWindowInfo.obtain();



            reportedWindow.setId(windowId);
@@ -703,21 +699,6 @@ public class AccessibilityWindowManager { 
            return reportedWindow;

        }



        private boolean isEmbeddedHierarchyWindowsLocked(int windowId) {

            final IBinder leashToken = mWindowIdMap.get(windowId);

            if (leashToken == null) {

                return false;

            }



            for (int i = 0; i < mHostEmbeddedMap.size(); i++) {

                if (mHostEmbeddedMap.keyAt(i).equals(leashToken)) {

                    return true;

                }

            }



            return false;

        }



        private int getTypeForWindowManagerWindowType(int windowType) {

            switch (windowType) {

                case WindowManager.LayoutParams.TYPE_APPLICATION:

services/core/java/com/android/server/wm/AccessibilityController.java

+207 −100

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java

deleted100644 → 0
+0 −625

File deleted.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/ShellRoot.java

+46 −6

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/WindowState.java

+3 −0
Original line number Diff line number Diff line
@@ -4809,6 +4809,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (isAnimating()) {

            return;

        }

        if (mWmService.mAccessibilityController.hasCallbacks()) {

            mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(getDisplayId());

        }



        if (!isSelfOrAncestorWindowAnimatingExit()) {

            return;