Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev (92847c96) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -2015,6 +2015,7 @@ public final class ViewRootImpl implements ViewParent,
		mLastWasImTarget = imTarget;
		InputMethodManager imm = InputMethodManager.peekInstance();
		if (imm != null && imTarget) {
		imm.startGettingWindowFocus(mView);
		imm.onWindowFocus(mView, mView.findFocus(),
		mWindowAttributes.softInputMode,
		!mHasHadWindowFocus, mWindowAttributes.flags);
		@@ -3321,6 +3322,10 @@ public final class ViewRootImpl implements ViewParent,

		InputMethodManager imm = InputMethodManager.peekInstance();
		if (mView != null) {
		if (hasWindowFocus && imm != null && mLastWasImTarget &&
		!isInLocalFocusMode()) {
		imm.startGettingWindowFocus(mView);
		}
		mAttachInfo.mKeyDispatchState.reset();
		mView.dispatchWindowFocusChanged(hasWindowFocus);
		mAttachInfo.mTreeObserver.dispatchOnWindowFocusChange(hasWindowFocus);

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

+29 −7

Original line number	Diff line number	Diff line
		@@ -282,6 +282,11 @@ public final class InputMethodManager {

		// -----------------------------------------------------------

		/**
		* This is the root view of the overall window that currently has input
		* method focus.
		*/
		View mCurRootView;
		/**
		* This is the view that should currently be served by an input method,
		* regardless of the state of setting that up.
		@@ -801,6 +806,7 @@ public final class InputMethodManager {
		* Disconnect any existing input connection, clearing the served view.
		*/
		void finishInputLocked() {
		mCurRootView = null;
		mNextServedView = null;
		if (mServedView != null) {
		if (DEBUG) Log.v(TAG, "FINISH INPUT: " + mServedView);
		@@ -1284,9 +1290,10 @@ public final class InputMethodManager {
		void focusInLocked(View view) {
		if (DEBUG) Log.v(TAG, "focusIn: " + view);

		if (!view.hasWindowFocus()) {
		// This is a request from a window that doesn't have window focus, so ignore it.
		if (DEBUG) Log.v(TAG, "Not focused window, ignoring");
		if (mCurRootView != view.getRootView()) {
		// This is a request from a window that isn't in the window with
		// IME focus, so ignore it.
		if (DEBUG) Log.v(TAG, "Not IME target window, ignoring");
		return;
		}

		@@ -1303,12 +1310,19 @@ public final class InputMethodManager {
		if (DEBUG) Log.v(TAG, "focusOut: " + view
		+ " mServedView=" + mServedView
		+ " winFocus=" + view.hasWindowFocus());
		if (mServedView == view && view.hasWindowFocus()) {
		if (mServedView != view) {
		// The following code would auto-hide the IME if we end up
		// with no more views with focus. This can happen, however,
		// whenever we go into touch mode, so it ends up hiding
		// at times when we don't really want it to. For now it
		// seems better to just turn it all off.
		if (false && view.hasWindowFocus()) {
		mNextServedView = null;
		scheduleCheckFocusLocked(view);
		}
		}
		}
		}

		static void scheduleCheckFocusLocked(View view) {
		ViewRootImpl viewRootImpl = view.getViewRootImpl();
		@@ -1428,6 +1442,13 @@ public final class InputMethodManager {
		}
		}

		/** @hide */
		public void startGettingWindowFocus(View rootView) {
		synchronized (mH) {
		mCurRootView = rootView;
		}
		}

		/**
		* Report the current selection range.
		*
		@@ -2135,6 +2156,7 @@ public final class InputMethodManager {
		+ " mBindSequence=" + mBindSequence
		+ " mCurId=" + mCurId);
		p.println(" mCurMethod=" + mCurMethod);
		p.println(" mCurRootView=" + mCurRootView);
		p.println(" mServedView=" + mServedView);
		p.println(" mNextServedView=" + mNextServedView);
		p.println(" mServedConnecting=" + mServedConnecting);

core/java/android/webkit/FindActionModeCallback.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
		}

		public void showSoftInput() {
		mInput.startGettingWindowFocus(mEditText.getRootView());
		mInput.focusIn(mEditText);
		mInput.showSoftInput(mEditText, 0);
		}