Merge "Correctly set search string when entering search" into lmp-mr1-dev (fa833f46) · Commits · e / os / android_packages_apps_Contacts

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

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ public class ActionBarAdapter implements OnCloseListener {
	new OnClickListener() {		new OnClickListener() {
	@Override		@Override
	public void onClick(View v) {		public void onClick(View v) {
	mSearchView.setText(null);		setQueryString(null);
	}		}
	});		});
	mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(		mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(
	@@ -254,9 +254,8 @@ public class ActionBarAdapter implements OnCloseListener {
	}		}
	if (mSearchMode) {		if (mSearchMode) {
	setFocusOnSearchView();		setFocusOnSearchView();
	} else {
	mSearchView.setText(null);
	}		}
			setQueryString(null);
	} else if (flag) {		} else if (flag) {
	// Everything is already set up. Still make sure the keyboard is up		// Everything is already set up. Still make sure the keyboard is up
	if (mSearchView != null) setFocusOnSearchView();		if (mSearchView != null) setFocusOnSearchView();
	@@ -271,6 +270,10 @@ public class ActionBarAdapter implements OnCloseListener {
	mQueryString = query;		mQueryString = query;
	if (mSearchView != null) {		if (mSearchView != null) {
	mSearchView.setText(query);		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	Original line	Diff line number	Diff line
	@@ -1188,8 +1188,8 @@ public class PeopleActivity extends ContactsActivity implements
	&& !Character.isWhitespace(unicodeChar)) {		&& !Character.isWhitespace(unicodeChar)) {
	String query = new String(new int[]{ unicodeChar }, 0, 1);		String query = new String(new int[]{ unicodeChar }, 0, 1);
	if (!mActionBarAdapter.isSearchMode()) {		if (!mActionBarAdapter.isSearchMode()) {
	mActionBarAdapter.setQueryString(query);
	mActionBarAdapter.setSearchMode(true);		mActionBarAdapter.setSearchMode(true);
			mActionBarAdapter.setQueryString(query);
	return true;		return true;
	}		}
	}		}