Making search mode triggered by focus in, but ignore focus out
Bug: 3340666
Change-Id: I75422950c9f708f4651ebf74a43f65eebcea9d11
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 2faa345..edf722d 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -119,21 +119,9 @@
@Override
public void onFocusChange(View v, boolean hasFocus) {
- if (v != mSearchView) {
- return;
+ if (v == mSearchView && hasFocus) {
+ setSearchMode(true);
}
-
- // When we switch search mode on/off, the activity may need to change
- // fragments, which may lead to focus temporarily leaving the search
- // view or coming back to it, which could lead to an infinite loop.
- // Postponing the change breaks that loop.
- mNavigationBar.post(new Runnable() {
-
- @Override
- public void run() {
- setSearchMode(mSearchView.hasFocus());
- }
- });
}
public boolean isSearchMode() {
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 7f5d43e..8fb3d95 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -69,7 +69,7 @@
headerContainer.addView(mCounterHeaderView);
mSearchHeaderView = inflater.inflate(R.layout.search_header, null, false);
headerContainer.addView(mSearchHeaderView);
- getListView().addHeaderView(headerContainer);
+ getListView().addHeaderView(headerContainer, null, false);
checkHeaderViewVisibility();
}