Merge "Update IMMI#removeImeSurface() to take display ID" into main (8cae90d7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerInternal.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -171,9 +171,11 @@ public abstract class InputMethodManagerInternal {
		public abstract void onImeParentChanged();

		/**
		* Destroys the IME surface.
		* Destroys the IME surface for the given display.
		*
		* @param displayId the display hosting the IME window
		*/
		public abstract void removeImeSurface();
		public abstract void removeImeSurface(int displayId);

		/**
		* Updates the IME visibility, back disposition and show IME picker status for SystemUI.
		@@ -302,7 +304,7 @@ public abstract class InputMethodManagerInternal {
		}

		@Override
		public void removeImeSurface() {
		public void removeImeSurface(int displayId) {
		}

		@Override

+1 −1

Original line number	Diff line number	Diff line
		@@ -5683,7 +5683,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		}

		@Override
		public void removeImeSurface() {
		public void removeImeSurface(int displayId) {
		mHandler.obtainMessage(MSG_REMOVE_IME_SURFACE).sendToTarget();
		}

+1 −1

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

		@Override
		public void notifyInsetsControlChanged() {
		public void notifyInsetsControlChanged(int displayId) {
		final InsetsStateController stateController = getInsetsStateController();
		try {
		mRemoteInsetsController.insetsControlChanged(stateController.getRawInsetsState(),

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,8 +29,10 @@ interface InsetsControlTarget {

		/**
		* Notifies the control target that the insets control has changed.
		*
		* @param displayId the display hosting the window of this target
		*/
		default void notifyInsetsControlChanged() {
		default void notifyInsetsControlChanged(int displayId) {
		};

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -728,7 +728,7 @@ class InsetsPolicy {
		}

		@Override
		public void notifyInsetsControlChanged() {
		public void notifyInsetsControlChanged(int displayId) {
		mHandler.post(this);
		}