commit 9fd8f25659185a031b2a7c6120da899e54e41127
author Andrew Lee <anwlee@google.com> Fri Jun 13 17:09:26 2014 -0700
committer Andrew Lee <anwlee@google.com> Mon Jun 16 17:27:58 2014 -0700
tree 1a90b8820b30df75b513b5a5e834b7206e57cd44
parent 00a3d5d576d53b43a46849bf40c43bccde44a9b2

Exit search UI when dialpad is hidden if no smart dial results.

Bug: 15471462
Change-Id: Iaa8fd146d69a1c3a28c3106620228b43a6409bdc

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 19af4ef..de68c8e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -59,7 +59,6 @@
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
-import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.android.contacts.common.CallUtil;
@@ -69,7 +68,6 @@
 import com.android.contacts.common.dialog.SelectSIMDialogFragment;
 import com.android.contacts.common.interactions.ImportExportDialogFragment;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
-import com.android.contacts.common.util.ViewUtil;
 import com.android.contacts.common.widget.FloatingActionButtonController;
 import com.android.dialer.calllog.CallLogActivity;
 import com.android.dialer.database.DialerDatabaseHelper;
@@ -967,7 +965,9 @@
     @Override
     public void onBackPressed() {
         if (mIsDialpadShown) {
-            if (TextUtils.isEmpty(mSearchQuery)) {
+            if (TextUtils.isEmpty(mSearchQuery) ||
+                    (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()
+                            && mSmartDialSearchFragment.getAdapter().getCount() == 0)) {
                 exitSearchUi();
             }
             hideDialpadFragment(true, false);