Merge "Hide keyboard when exiting search view" into lmp-mr1-dev (44ab5729) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/ActionBarAdapter.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.SearchView;
		import android.widget.SearchView.OnCloseListener;
		import android.view.View.OnClickListener;
		import android.widget.EditText;
		@@ -253,7 +252,11 @@ public class ActionBarAdapter implements OnCloseListener {
		return;
		}
		if (mSearchMode) {
		mSearchView.setEnabled(true);
		setFocusOnSearchView();
		} else {
		// Disable search view, so that it doesn't keep the IME visible.
		mSearchView.setEnabled(false);
		}
		setQueryString(null);
		} else if (flag) {
		@@ -399,18 +402,6 @@ public class ActionBarAdapter implements OnCloseListener {
		outState.putInt(EXTRA_KEY_SELECTED_TAB, mCurrentTab);
		}

		/**
		* Clears the focus from the {@link SearchView} if we are in search mode.
		* This will suppress the IME if it is visible.
		*/
		public void clearFocusOnSearchView() {
		if (isSearchMode()) {
		if (mSearchView != null) {
		mSearchView.clearFocus();
		}
		}
		}

		public void setFocusOnSearchView() {
		mSearchView.requestFocus();
		showInputMethod(mSearchView); // Workaround for the "IME not popping up" issue.