Merge "Add WINDOW_GAINED_FOCUS to IntDef annotation" (b4e58c35) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/inputmethod/StartInputFlags.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,9 @@ import java.lang.annotation.Retention;
	@IntDef(flag = true, value = {		@IntDef(flag = true, value = {
	StartInputFlags.VIEW_HAS_FOCUS,		StartInputFlags.VIEW_HAS_FOCUS,
	StartInputFlags.IS_TEXT_EDITOR,		StartInputFlags.IS_TEXT_EDITOR,
	StartInputFlags.INITIAL_CONNECTION})		StartInputFlags.INITIAL_CONNECTION,
			StartInputFlags.WINDOW_GAINED_FOCUS,
			})
	public @interface StartInputFlags {		public @interface StartInputFlags {
	/**		/**
	* There is a focused view in the focused window.		* There is a focused view in the focused window.
	@@ -40,17 +42,17 @@ public @interface StartInputFlags {
	/**		/**
	* The focused view is a text editor.		* The focused view is a text editor.
	*/		*/
	int IS_TEXT_EDITOR = 2;		int IS_TEXT_EDITOR = 1 << 1;

	/**		/**
	* An internal concept to distinguish "start" and "restart". This concept doesn't look well		* An internal concept to distinguish "start" and "restart". This concept doesn't look well
	* documented hence we probably need to revisit this though.		* documented hence we probably need to revisit this though.
	*/		*/
	int INITIAL_CONNECTION = 4;		int INITIAL_CONNECTION = 1 << 2;

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