Merge "Re-start input when the IME is deactivated but window is focused" (460f457e) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -403,6 +403,9 @@ public final class InputMethodManager {
	mIInputContext.finishComposingText();		mIInputContext.finishComposingText();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}
			// Check focus again in case that "onWindowFocus" is called before
			// handling this message.
			checkFocus(mHasBeenInactive);
	}		}
	}		}
	return;		return;
	@@ -1173,13 +1176,17 @@ public final class InputMethodManager {
	}		}
	}		}

			private void checkFocus(boolean forceNewFocus) {
			if (checkFocusNoStartInput(forceNewFocus)) {
			startInputInner(null, 0, 0, 0);
			}
			}

	/**		/**
	* @hide		* @hide
	*/		*/
	public void checkFocus() {		public void checkFocus() {
	if (checkFocusNoStartInput(false)) {		checkFocus(false);
	startInputInner(null, 0, 0, 0);
	}
	}		}

	private boolean checkFocusNoStartInput(boolean forceNewFocus) {		private boolean checkFocusNoStartInput(boolean forceNewFocus) {