Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev (62748d0a) · Commits · e / os / android_frameworks_base

core/java/android/view/ImeFocusController.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -165,10 +165,16 @@ public final class ImeFocusController {
		if (!getImmDelegate().isCurrentRootView(view.getViewRootImpl())) {
		return;
		}
		if (mServedView == view \|\| !view.hasImeFocus() \|\| !view.hasWindowFocus()) {
		if (!view.hasImeFocus() \|\| !view.hasWindowFocus()) {
		return;
		}
		mNextServedView = hasFocus ? view : null;
		if (DEBUG) Log.d(TAG, "onViewFocusChanged, view=" + view + ", mServedView=" + mServedView);

		if (hasFocus) {
		mNextServedView = view;
		} else if (view == mServedView) {
		mNextServedView = null;
		}
		mViewRootImpl.dispatchCheckFocus();
		}