commit 005865ae517fb9737617bcfb22447638ac3f269e
author Andrew Lee <anwlee@google.com> Sat Jun 14 00:43:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 12 05:34:42 2014 +0000
tree 57aa74c236c45d0c6942d91fdf32d8c1688bf400
parent 4351555b89deea2a37607e159c4419ca85d492e3
parent a851542c69872ffa6c5615fd8cdd1381f1b13b93

Merge "Clear fragments properly when search term is erased."

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 19af4ef..f5a2d3e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -310,9 +310,9 @@
                 }
             }
 
-            if (mIsDialpadShown && mSmartDialSearchFragment != null) {
+            if (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()) {
                 mSmartDialSearchFragment.setQueryString(mSearchQuery, false /* delaySelection */);
-            } else if (mRegularSearchFragment != null) {
+            } else if (mRegularSearchFragment != null && mRegularSearchFragment.isVisible()) {
                 mRegularSearchFragment.setQueryString(mSearchQuery, false /* delaySelection */);
             }
         }
@@ -550,13 +550,6 @@
                     mDialpadFragment.dialButtonPressed();
                 }
                 break;
-            case R.id.search_close_button:
-                // Clear the search field
-                if (!TextUtils.isEmpty(mSearchView.getText())) {
-                    mDialpadFragment.clearDialpad();
-                    mSearchView.setText(null);
-                }
-                break;
             case R.id.voice_search_button:
                 try {
                     startActivityForResult(new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH),