Merge "Update IMMI#updateImeWindowStatus() to take display ID" into main (df6c26ec) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -160,8 +160,11 @@ public abstract class InputMethodManagerInternal {
		* Updates the IME visibility, back disposition and show IME picker status for SystemUI.
		* TODO(b/189923292): Making SystemUI to be true IME icon controller vs. presenter that
		* controlled by IMMS.
		*
		* @param disableImeIcon indicates whether IME icon should be enabled or not
		* @param displayId the display for which to update the IME window status
		*/
		public abstract void updateImeWindowStatus(boolean disableImeIcon);
		public abstract void updateImeWindowStatus(boolean disableImeIcon, int displayId);

		/**
		* Finish stylus handwriting by calling {@link InputMethodService#finishStylusHandwriting()} if
		@@ -269,7 +272,7 @@ public abstract class InputMethodManagerInternal {
		}

		@Override
		public void updateImeWindowStatus(boolean disableImeIcon) {
		public void updateImeWindowStatus(boolean disableImeIcon, int displayId) {
		}

		@Override

+1 −1

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

		@Override
		public void updateImeWindowStatus(boolean disableImeIcon) {
		public void updateImeWindowStatus(boolean disableImeIcon, int displayId) {
		mHandler.obtainMessage(MSG_UPDATE_IME_WINDOW_STATUS, disableImeIcon ? 1 : 0, 0)
		.sendToTarget();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ final class InputMonitor {
		// in animating before the next app window focused, or IME icon
		// persists on the bottom when swiping the task to recents.
		InputMethodManagerInternal.get().updateImeWindowStatus(
		true /* disableImeIcon */);
		true /* disableImeIcon */, mDisplayContent.getDisplayId());
		}
		}
		return;

+2 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,8 @@ class KeyguardController {
		// state when evaluating visibilities.
		updateKeyguardSleepToken();
		mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
		InputMethodManagerInternal.get().updateImeWindowStatus(false /* disableImeIcon */);
		InputMethodManagerInternal.get().updateImeWindowStatus(false /* disableImeIcon */,
		displayId);
		setWakeTransitionReady();
		if (aodChanged) {
		// Ensure the new state takes effect.

+2 −1

Original line number	Diff line number	Diff line
		@@ -967,7 +967,8 @@ public class RecentsAnimationController implements DeathRecipient {
		// Restore IME icon only when moving the original app task to front from recents, in case
		// IME icon may missing if the moving task has already been the current focused task.
		if (reorderMode == REORDER_MOVE_TO_ORIGINAL_POSITION && !mIsAddingTaskToTargets) {
		InputMethodManagerInternal.get().updateImeWindowStatus(false /* disableImeIcon */);
		InputMethodManagerInternal.get().updateImeWindowStatus(
		false /* disableImeIcon */, mDisplayId);
		}

		// Update the input windows after the animation is complete