commit 7206cebd7b267abbbc3de5d529ddf9a8f5ef176f
author Yorke Lee <yorkelee@google.com> Tue May 20 20:45:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 20 20:45:57 2014 +0000
tree bf14e7b9e4fcab22255334cdb00be8c189e6e8ad
parent 1393ce91145e01000abe6696f237a9cd17e1b043
parent ec489fb5d4bba57ccdfd24b48e26257294d29979

Merge "Make searchbox expand when entering search UI"

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 4149f39..39f611e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -610,7 +610,11 @@
 
         mListsFragment.maybeShowActionBar();
         if (isInSearchUi()) {
-            mSearchIcon.setVisibility(View.GONE);
+            if (TextUtils.isEmpty(mSearchQuery)) {
+                exitSearchUi();
+            } else {
+                mSearchIcon.setVisibility(View.GONE);
+            }
         }
     }