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

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

Merge changes from topic "Surface Flinger" 

* changes:
  Apply display transform to window bounds and node bounds
  Use shellRoot to identify PIP menu window
  Uses SF callback windows for the A11yWindowInfo [2/n]
  Uses SF callback windows for the A11yWindowInfo [1/n]
parents 00b4516b 3b328cce

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

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

                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();

            final AccessibilityWindowInfo reportedWindow = AccessibilityWindowInfo.obtain();





            reportedWindow.setId(windowId);

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

            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) {

        private int getTypeForWindowManagerWindowType(int windowType) {

            switch (windowType) {

            switch (windowType) {

                case WindowManager.LayoutParams.TYPE_APPLICATION:

                case WindowManager.LayoutParams.TYPE_APPLICATION:

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

+100 −207

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+625 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+6 −46

File changed.

Preview size limit exceeded, changes collapsed.

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

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

        if (isAnimating()) {

            return;

            return;

        }

        }

        if (mWmService.mAccessibilityController.hasCallbacks()) {

            mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(getDisplayId());

        }





        if (!isSelfOrAncestorWindowAnimatingExit()) {

        if (!isSelfOrAncestorWindowAnimatingExit()) {

            return;

            return;