Merge " Hide "clear" action for empty search query." into mnc-dev (698ff30e) · Commits · e / os / android_packages_apps_Contacts

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

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ public class ActionBarAdapter implements OnCloseListener {
	private String mQueryString;		private String mQueryString;

	private EditText mSearchView;		private EditText mSearchView;
			private View mClearSearchView;
	/ The view that represents tabs when we are in portrait mode /		/ The view that represents tabs when we are in portrait mode /
	private View mPortraitTabs;		private View mPortraitTabs;
	/ The view that represents tabs when we are in landscape mode /		/ The view that represents tabs when we are in landscape mode /
	@@ -140,6 +141,7 @@ public class ActionBarAdapter implements OnCloseListener {
	// Hide tabs initially		// Hide tabs initially
	setPortraitTabHeight(0);		setPortraitTabHeight(0);
	}		}

	private void setupSearchAndSelectionViews() {		private void setupSearchAndSelectionViews() {
	final LayoutInflater inflater = (LayoutInflater) mToolbar.getContext().getSystemService(		final LayoutInflater inflater = (LayoutInflater) mToolbar.getContext().getSystemService(
	Context.LAYOUT_INFLATER_SERVICE);		Context.LAYOUT_INFLATER_SERVICE);
	@@ -154,20 +156,22 @@ public class ActionBarAdapter implements OnCloseListener {
	mSearchView = (EditText) mSearchContainer.findViewById(R.id.search_view);		mSearchView = (EditText) mSearchContainer.findViewById(R.id.search_view);
	mSearchView.setHint(mActivity.getString(R.string.hint_findContacts));		mSearchView.setHint(mActivity.getString(R.string.hint_findContacts));
	mSearchView.addTextChangedListener(new SearchTextWatcher());		mSearchView.addTextChangedListener(new SearchTextWatcher());
	mSearchContainer.findViewById(R.id.search_close_button).setOnClickListener(		mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(
	new OnClickListener() {		new OnClickListener() {
	@Override		@Override
	public void onClick(View v) {		public void onClick(View v) {
	setQueryString(null);		if (mListener != null) {
			mListener.onUpButtonPressed();
			}
	}		}
	});		});
	mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(
			mClearSearchView = mSearchContainer.findViewById(R.id.search_close_button);
			mClearSearchView.setOnClickListener(
	new OnClickListener() {		new OnClickListener() {
	@Override		@Override
	public void onClick(View v) {		public void onClick(View v) {
	if (mListener != null) {		setQueryString(null);
	mListener.onUpButtonPressed();
	}
	}		}
	});		});

	@@ -235,6 +239,8 @@ public class ActionBarAdapter implements OnCloseListener {
	} else if (mListener != null) {		} else if (mListener != null) {
	mListener.onAction(Action.CHANGE_SEARCH_QUERY);		mListener.onAction(Action.CHANGE_SEARCH_QUERY);
	}		}
			mClearSearchView.setVisibility(
			TextUtils.isEmpty(queryString) ? View.GONE : View.VISIBLE);
	}		}

	@Override		@Override