summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-20 18:56:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-20 18:56:23 +0000
commit1393ce91145e01000abe6696f237a9cd17e1b043 (patch)
tree0270c6fb5e9642a85e820e9494e03b48e982bc4b /src
parent024a7f84fe0c605f97ffe4a176d5a8c2c17ffe7a (diff)
parent44e3daf13a1dfe5a0c7b4b0737f4000aea8fda27 (diff)
Merge "Exit search UI before dialing."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/DialtactsActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 3b68db97b..9586d252e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -609,7 +609,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
mListsFragment.maybeShowActionBar();
if (isInSearchUi()) {
- mSearchIcon.setVisibility(View.GONE);
+ if (TextUtils.isEmpty(mSearchQuery)) {
+ exitSearchUi();
+ } else {
+ mSearchIcon.setVisibility(View.GONE);
+ }
}
}