Merge "Restore the last IME visiblity of the app window when allowed" into sc-dev (02116c6a) · Commits · e / os / android_frameworks_base

core/java/android/view/ImeFocusController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,9 @@ public final class ImeFocusController {
		if (!hasWindowFocus \|\| !mHasImeFocus \|\| isInLocalFocusMode(windowAttribute)) {
		return;
		}
		View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
		if (DEBUG) {
		Log.v(TAG, "onWindowFocus: " + focusedView
		Log.v(TAG, "onWindowFocus: " + viewForWindowFocus
		+ " softInputMode=" + InputMethodDebug.softInputModeToString(
		windowAttribute.softInputMode));
		}
		@@ -128,8 +129,8 @@ public final class ImeFocusController {
		if (DEBUG) Log.v(TAG, "Restarting due to isRestartOnNextWindowFocus as true");
		forceFocus = true;
		}

		// Update mNextServedView when focusedView changed.
		final View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
		onViewFocusChanged(viewForWindowFocus, true);

		// Starting new input when the next focused view is same as served view but the currently

+2 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,8 @@ public final class InputMethodDebug {
		return "HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR";
		case SoftInputShowHideReason.HIDE_REMOVE_CLIENT:
		return "HIDE_REMOVE_CLIENT";
		case SoftInputShowHideReason.SHOW_RESTORE_IME_VISIBILITY:
		return "SHOW_RESTORE_IME_VISIBILITY";
		default:
		return "Unknown=" + reason;
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,8 @@ import java.lang.annotation.Retention;
		SoftInputShowHideReason.HIDE_RECENTS_ANIMATION,
		SoftInputShowHideReason.HIDE_BUBBLES,
		SoftInputShowHideReason.HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR,
		SoftInputShowHideReason.HIDE_REMOVE_CLIENT})
		SoftInputShowHideReason.HIDE_REMOVE_CLIENT,
		SoftInputShowHideReason.SHOW_RESTORE_IME_VISIBILITY})
		public @interface SoftInputShowHideReason {
		/** Show soft input by {@link android.view.inputmethod.InputMethodManager#showSoftInput}. */
		int SHOW_SOFT_INPUT = 0;
		@@ -167,4 +168,10 @@ public @interface SoftInputShowHideReason {
		* Hide soft input when a {@link com.android.internal.view.IInputMethodClient} is removed.
		*/
		int HIDE_REMOVE_CLIENT = 21;

		/**
		* Show soft input when the system invoking
		* {@link com.android.server.wm.WindowManagerInternal#shouldRestoreImeVisibility}.
		*/
		int SHOW_RESTORE_IME_VISIBILITY = 22;
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -3536,6 +3536,20 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		boolean didStart = false;

		InputBindResult res = null;
		// We shows the IME when the system allows the IME focused target window to restore the
		// IME visibility (e.g. switching to the app task when last time the IME is visible).
		if (isTextEditor && mWindowManagerInternal.shouldRestoreImeVisibility(windowToken)) {
		if (attribute != null) {
		res = startInputUncheckedLocked(cs, inputContext, missingMethods,
		attribute, startInputFlags, startInputReason);
		showCurrentInputLocked(windowToken, InputMethodManager.SHOW_IMPLICIT, null,
		SoftInputShowHideReason.SHOW_RESTORE_IME_VISIBILITY);
		} else {
		res = InputBindResult.NULL_EDITOR_INFO;
		}
		return res;
		}

		switch (softInputMode & LayoutParams.SOFT_INPUT_MASK_STATE) {
		case LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED:
		if (!sameWindowFocused && (!isTextEditor \|\| !doAutoShow)) {

+9 −0

Original line number	Diff line number	Diff line
		@@ -667,4 +667,13 @@ public abstract class WindowManagerInternal {
		* Moves the {@link WindowToken} {@code binder} to the display specified by {@code displayId}.
		*/
		public abstract void moveWindowTokenToDisplay(IBinder binder, int displayId);

		/**
		* Checks whether the given window should restore the last IME visibility.
		*
		* @param imeTargetWindowToken The token of the (IME target) window
		* @return {@code true} when the system allows to restore the IME visibility,
		* {@code false} otherwise.
		*/
		public abstract boolean shouldRestoreImeVisibility(IBinder imeTargetWindowToken);
		}