Merge "WM: Make AccessibilityController persistent" into sc-v2-dev (ef4d26ab) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -904,7 +904,7 @@ public class AppTransitionController {

		final AccessibilityController accessibilityController =
		mDisplayContent.mWmService.mAccessibilityController;
		if (accessibilityController != null) {
		if (accessibilityController.hasCallbacks()) {
		accessibilityController.onAppWindowTransition(mDisplayContent.getDisplayId(), transit);
		}
		}

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

+4 −4

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

		addWindowToken(token.token, token);

		if (mWmService.mAccessibilityController != null) {
		if (mWmService.mAccessibilityController.hasCallbacks()) {
		final int prevDisplayId = prevDc != null ? prevDc.getDisplayId() : INVALID_DISPLAY;
		mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(prevDisplayId,
		getDisplayId());
		@@ -3569,7 +3569,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		// focused one starts firing events.
		// TODO(b/151179149) investigate what info accessibility service needs before input can
		// dispatch focus to clients.
		if (mWmService.mAccessibilityController != null) {
		if (mWmService.mAccessibilityController.hasCallbacks()) {
		mWmService.mH.sendMessage(PooledLambda.obtainMessage(
		this::updateAccessibilityOnWindowFocusChanged,
		mWmService.mAccessibilityController));
		@@ -5216,7 +5216,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}
		if (!mLocationInParentWindow.equals(x, y)) {
		mLocationInParentWindow.set(x, y);
		if (mWmService.mAccessibilityController != null) {
		if (mWmService.mAccessibilityController.hasCallbacks()) {
		mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(mDisplayId);
		}
		notifyLocationInParentDisplayChanged();
		@@ -5774,7 +5774,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		@Override
		void onResize() {
		super.onResize();
		if (mWmService.mAccessibilityController != null) {
		if (mWmService.mAccessibilityController.hasCallbacks()) {
		mWmService.mAccessibilityController.onDisplaySizeChanged(this);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class DockedTaskDividerController {
		void setTouchRegion(Rect touchRegion) {
		mTouchRegion.set(touchRegion);
		// We need to report touchable region changes to accessibility.
		if (mDisplayContent.mWmService.mAccessibilityController != null) {
		if (mDisplayContent.mWmService.mAccessibilityController.hasCallbacks()) {
		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
		@@ -197,7 +197,7 @@ public class ShellRoot {
		mAccessibilityWindow = null;
		}
		}
		if (mDisplayContent.mWmService.mAccessibilityController != null) {
		if (mDisplayContent.mWmService.mAccessibilityController.hasCallbacks()) {
		mDisplayContent.mWmService.mAccessibilityController.onSomeWindowResizedOrMoved(
		mDisplayContent.getDisplayId());
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ public class WindowAnimator {
		final DisplayContent dc = root.getDisplayContent(displayId);

		dc.checkAppWindowsReadyToShow();
		if (accessibilityController != null) {
		if (accessibilityController.hasCallbacks()) {
		accessibilityController.drawMagnifiedRegionBorderIfNeeded(displayId,
		mTransaction);
		}