Hide "clear" action if search text is empty. (99413b41) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/widget/SearchEditTextLayout.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ import android.animation.ValueAnimator;
		import android.animation.ValueAnimator.AnimatorUpdateListener;
		import android.content.Context;
		import android.util.AttributeSet;
		import android.text.Editable;
		import android.text.TextUtils;
		import android.text.TextWatcher;
		import android.view.KeyEvent;
		import android.view.View;
		import android.widget.EditText;
		@@ -123,6 +126,21 @@ public class SearchEditTextLayout extends FrameLayout {
		}
		});

		mSearchView.addTextChangedListener(new TextWatcher() {
		@Override
		public void beforeTextChanged(CharSequence s, int start, int count, int after) {
		}

		@Override
		public void onTextChanged(CharSequence s, int start, int before, int count) {
		mClearButtonView.setVisibility(TextUtils.isEmpty(s) ? View.GONE : View.VISIBLE);
		}

		@Override
		public void afterTextChanged(Editable s) {
		}
		});

		findViewById(R.id.search_close_button).setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View v) {
		@@ -177,6 +195,7 @@ public class SearchEditTextLayout extends FrameLayout {
		mIsFadedOut = true;
		}
		}

		public void expand(boolean animate, boolean requestFocus) {
		updateVisibility(true /* isExpand */);

		@@ -245,8 +264,12 @@ public class SearchEditTextLayout extends FrameLayout {
		// TODO: Prevents keyboard from jumping up in landscape mode after exiting the
		// SearchFragment when the query string is empty. More elegant fix?
		//mExpandedSearchBox.setVisibility(expandedViewVisibility);
		if (TextUtils.isEmpty(mSearchView.getText())) {
		mClearButtonView.setVisibility(View.GONE);
		} else {
		mClearButtonView.setVisibility(expandedViewVisibility);
		}
		}

		private void prepareAnimator(final boolean expand) {
		if (mAnimator != null) {