commit 432cfa109479782f1c5765a1ad80d332b8781310
author Andrew Lee <anwlee@google.com> Thu May 07 22:04:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 07 22:04:15 2015 +0000
tree 03811db84a59e2ebd96fbbc223e0e774b6e28b13
parent 99413b41c5af53bf00d6726822aceba3f5baea73
parent 51c2bde72ee4674266ac464bea2aba72d217d75f

Merge "Update layouts for call log list item actions." into mnc-dev

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

diff --git a/src/com/android/dialer/widget/SearchEditTextLayout.java b/src/com/android/dialer/widget/SearchEditTextLayout.java
index f22a3be..f1fa986 100644
--- a/src/com/android/dialer/widget/SearchEditTextLayout.java
+++ b/src/com/android/dialer/widget/SearchEditTextLayout.java
@@ -20,6 +20,9 @@
 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 @@
             }
         });
 
+        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 @@
             mIsFadedOut = true;
         }
     }
+
     public void expand(boolean animate, boolean requestFocus) {
         updateVisibility(true /* isExpand */);
 
@@ -245,7 +264,11 @@
         // 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);
-        mClearButtonView.setVisibility(expandedViewVisibility);
+        if (TextUtils.isEmpty(mSearchView.getText())) {
+            mClearButtonView.setVisibility(View.GONE);
+        } else {
+            mClearButtonView.setVisibility(expandedViewVisibility);
+        }
     }
 
     private void prepareAnimator(final boolean expand) {