Snap for 6869386 from f54a2f3e49ce55e2287240105a4858695940ab4a to rvc-qpr1-release (e6e9ce7b) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -611,7 +611,8 @@ public final class InputMethodManager {
		@Override
		public void startInputAsyncOnWindowFocusGain(View focusedView,
		@SoftInputModeFlags int softInputMode, int windowFlags, boolean forceNewFocus) {
		final int startInputFlags = getStartInputFlags(focusedView, 0);
		int startInputFlags = getStartInputFlags(focusedView, 0);
		startInputFlags \|= StartInputFlags.WINDOW_GAINED_FOCUS;

		final ImeFocusController controller = getFocusController();
		if (controller == null) {

+2 −0

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@ import java.lang.annotation.Retention;
		SoftInputShowHideReason.HIDE_POWER_BUTTON_GO_HOME,
		SoftInputShowHideReason.HIDE_DOCKED_STACK_ATTACHED,
		SoftInputShowHideReason.HIDE_RECENTS_ANIMATION,
		SoftInputShowHideReason.HIDE_BUBBLES})
		SoftInputShowHideReason.HIDE_BUBBLES,
		SoftInputShowHideReason.HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR})
		public @interface SoftInputShowHideReason {
		/** Show soft input by {@link android.view.inputmethod.InputMethodManager#showSoftInput}. */
		int SHOW_SOFT_INPUT = 0;
		@@ -147,4 +148,17 @@ public @interface SoftInputShowHideReason {
		* switching, or collapsing Bubbles.
		*/
		int HIDE_BUBBLES = 19;

		/**
		* Hide soft input when focusing the same window (e.g. screen turned-off and turn-on) which no
		* valid focused editor.
		*
		* Note: From Android R, the window focus change callback is processed by InputDispatcher,
		* some focus behavior changes (e.g. There are an activity with a dialog window, after
		* screen turned-off and turned-on, before Android R the window focus sequence would be
		* the activity first and then the dialog focused, however, in R the focus sequence would be
		* only the dialog focused as it's the latest window with input focus) makes we need to hide
		* soft-input when the same window focused again to align with the same behavior prior to R.
		*/
		int HIDE_SAME_WINDOW_FOCUSED_WITHOUT_EDITOR = 20;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,4 +47,10 @@ public @interface StartInputFlags {
		* documented hence we probably need to revisit this though.
		*/
		int INITIAL_CONNECTION = 4;

		/**
		* The start input happens when the window gained focus to call
		* {@code android.view.inputmethod.InputMethodManager#startInputAsyncOnWindowFocusGain}.
		*/
		int WINDOW_GAINED_FOCUS = 8;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -538,7 +538,7 @@
		<string name="user_setup_button_setup_now" msgid="1708269547187760639">"지금 설정"</string>
		<string name="user_setup_button_setup_later" msgid="8712980133555493516">"나중에"</string>
		<string name="user_add_user_type_title" msgid="551279664052914497">"추가"</string>
		<string name="user_new_user_name" msgid="60979820612818840">"새 사용자"</string>
		<string name="user_new_user_name" msgid="60979820612818840">"신규 사용자"</string>
		<string name="user_new_profile_name" msgid="2405500423304678841">"새 프로필"</string>
		<string name="user_info_settings_title" msgid="6351390762733279907">"사용자 정보"</string>
		<string name="profile_info_settings_title" msgid="105699672534365099">"프로필 정보"</string>