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

Commit edac7449 authored by Hongming Jin's avatar Hongming Jin Committed by Automerger Merge Worker
Browse files

Merge "Add AccessibilityTracing and trace AccessibilityController." into sc-dev am: 104afdfb 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4337be6447e739c511ba19b611e64ec354194db8
parents 91273245 104afdfb

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

+597 −115

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −2
Original line number Diff line number Diff line
@@ -724,8 +724,7 @@ public class AppTransitionController { 
        final AccessibilityController accessibilityController =

                mDisplayContent.mWmService.mAccessibilityController;

        if (accessibilityController != null) {

            accessibilityController.onAppWindowTransitionLocked(

                    mDisplayContent.getDisplayId(), transit);

            accessibilityController.onAppWindowTransition(mDisplayContent.getDisplayId(), transit);

        }

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 


        if (mWmService.mAccessibilityController != null) {

            final int prevDisplayId = prevDc != null ? prevDc.getDisplayId() : INVALID_DISPLAY;

            mWmService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(prevDisplayId,

            mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(prevDisplayId,

                    getDisplayId());

        }

    }
@@ -1850,7 +1850,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        }



        if (mWmService.mAccessibilityController != null) {

            mWmService.mAccessibilityController.onRotationChangedLocked(this);

            mWmService.mAccessibilityController.onRotationChanged(this);

        }

    }
@@ -3400,7 +3400,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    }



    void updateAccessibilityOnWindowFocusChanged(AccessibilityController accessibilityController) {

        accessibilityController.onWindowFocusChangedNotLocked(getDisplayId());

        accessibilityController.onWindowFocusChangedNot(getDisplayId());

    }



    private static void onWindowFocusChanged(WindowState oldFocus, WindowState newFocus) {
@@ -4963,7 +4963,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        if (!mLocationInParentWindow.equals(x, y)) {

            mLocationInParentWindow.set(x, y);

            if (mWmService.mAccessibilityController != null) {

                mWmService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(mDisplayId);

                mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(mDisplayId);

            }

            notifyLocationInParentDisplayChanged();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class DockedStackDividerController { 
        mTouchRegion.set(touchRegion);

        // We need to report touchable region changes to accessibility.

        if (mDisplayContent.mWmService.mAccessibilityController != null) {

            mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(

            mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(

                    mDisplayContent.getDisplayId());

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class ShellRoot { 
            }

        }

        if (mDisplayContent.mWmService.mAccessibilityController != null) {

            mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(

            mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(

                    mDisplayContent.getDisplayId());

        }

    }