Merge "Correctly set search string when entering search" (7ecd6f56) · Commits · e / os / android_packages_apps_Contacts

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public class ActionBarAdapter implements OnCloseListener {
		new OnClickListener() {
		@Override
		public void onClick(View v) {
		mSearchView.setText(null);
		setQueryString(null);
		}
		});
		mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(
		@@ -256,9 +256,8 @@ public class ActionBarAdapter implements OnCloseListener {
		}
		if (mSearchMode) {
		setFocusOnSearchView();
		} else {
		mSearchView.setText(null);
		}
		setQueryString(null);
		} else if (flag) {
		// Everything is already set up. Still make sure the keyboard is up
		if (mSearchView != null) setFocusOnSearchView();
		@@ -273,6 +272,10 @@ public class ActionBarAdapter implements OnCloseListener {
		mQueryString = query;
		if (mSearchView != null) {
		mSearchView.setText(query);
		// When programmatically entering text into the search view, the most reasonable
		// place for the cursor is after all the text.
		mSearchView.setSelection(mSearchView.getText() == null ?
		0 : mSearchView.getText().length());
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1636,8 +1636,8 @@ public class PeopleActivity extends ContactsActivity implements
		&& !Character.isWhitespace(unicodeChar)) {
		String query = new String(new int[]{ unicodeChar }, 0, 1);
		if (!mActionBarAdapter.isSearchMode()) {
		mActionBarAdapter.setQueryString(query);
		mActionBarAdapter.setSearchMode(true);
		mActionBarAdapter.setQueryString(query);
		return true;
		}
		}