Merge "Stop showing soft IME in picker screens" into ics-mr1
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 3098864..ac13ba3 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -209,6 +209,9 @@
}
}, FOCUS_DELAY);
}
+
+ // Clear focus and suppress keyboard show-up.
+ mSearchView.clearFocus();
}
@Override
@@ -223,19 +226,6 @@
}
@Override
- public void onStart() {
- super.onStart();
-
- if (mSearchView != null && mSearchView.getVisibility() == View.VISIBLE) {
- if (mSearchView.hasFocus()) {
- showInputMethod(mSearchView.findFocus());
- } else {
- mSearchView.requestFocus();
- }
- }
- }
-
- @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home: