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

Commit 7ccfe2b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "SF_Solution" into tm-dev am: 2a01b661

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996786

Change-Id: I5469a54b0610b8da94f959aa3a02491b962b5240
parents 9cb90243 2a01b661
Loading
Loading
Loading
Loading
+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:
+100 −207

File changed.

Preview size limit exceeded, changes collapsed.

+626 −0

File added.

Preview size limit exceeded, changes collapsed.

+6 −45

File changed.

Preview size limit exceeded, changes collapsed.

+0 −3
Original line number Original line Diff line number Diff line
@@ -4992,9 +4992,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;