Merge "Rename #updateInputMethodWindowStatus() to #setDismissImeOnBackKeyPressed()" into sc-dev (9ab188a7) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2923,8 +2923,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		dismissImeOnBackKeyPressed = ((vis & InputMethodService.IME_VISIBLE) != 0);
		break;
		}
		mWindowManagerInternal.updateInputMethodWindowStatus(token,
		(vis & InputMethodService.IME_VISIBLE) != 0, dismissImeOnBackKeyPressed);
		mWindowManagerInternal.setDismissImeOnBackKeyPressed(dismissImeOnBackKeyPressed);
		}

		@BinderThread

+2 −11

Original line number	Diff line number	Diff line
		@@ -451,24 +451,15 @@ public abstract class WindowManagerInternal {
		public abstract int getInputMethodWindowVisibleHeight(int displayId);

		/**
		* Notifies WindowManagerService that the current IME window status is being changed.
		* Notifies WindowManagerService that the expected back-button behavior might have changed.
		*
		* <p>Only {@link com.android.server.inputmethod.InputMethodManagerService} is the expected and
		* tested caller of this method.</p>
		*
		* @param imeToken token to track the active input method. Corresponding IME windows can be
		* identified by checking {@link android.view.WindowManager.LayoutParams#token}.
		* Note that there is no guarantee that the corresponding window is already
		* created
		* @param imeWindowVisible whether the active IME thinks that its window should be visible or
		* hidden, no matter how WindowManagerService will react / has reacted
		* to corresponding API calls. Note that this state is not guaranteed
		* to be synchronized with state in WindowManagerService.
		* @param dismissImeOnBackKeyPressed {@code true} if the software keyboard is shown and the back
		* key is expected to dismiss the software keyboard.
		*/
		public abstract void updateInputMethodWindowStatus(@NonNull IBinder imeToken,
		boolean imeWindowVisible, boolean dismissImeOnBackKeyPressed);
		public abstract void setDismissImeOnBackKeyPressed(boolean dismissImeOnBackKeyPressed);

		/**
		* Notifies WindowManagerService that the current IME window status is being changed.

+1 −2

Original line number	Diff line number	Diff line
		@@ -7718,8 +7718,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		@Override
		public void updateInputMethodWindowStatus(@NonNull IBinder imeToken,
		boolean imeWindowVisible, boolean dismissImeOnBackKeyPressed) {
		public void setDismissImeOnBackKeyPressed(boolean dismissImeOnBackKeyPressed) {
		mPolicy.setDismissImeOnBackKeyPressed(dismissImeOnBackKeyPressed);
		}