From c37701295f8a4552f5d92437c8bbcf481495b06b Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Fri, 13 Oct 2017 16:36:17 -0700
Subject: Bug fixes for new search ui w/ Dialpad.

- Dialpad now hides if user tries to scroll w/ a search query.
- Search now closes if the user touches the blank area w/o a search query.
- Since we don't even show location results in dialpad search,
  we no longer request location permission in it.

Bug: 67657783,67656915
Test: tba
PiperOrigin-RevId: 172162620
Change-Id: I33a814797a053600e56fb163fd55b0c43e00a9c6
---
 java/com/android/dialer/app/DialtactsActivity.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'java/com/android/dialer/app')

diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 164c1ea82..791a710a9 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -124,6 +124,7 @@ import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.proguard.UsedByReflection;
 import com.android.dialer.searchfragment.list.NewSearchFragment;
+import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListTouchListener;
 import com.android.dialer.simulator.Simulator;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.dialer.smartdial.SmartDialNameMatcher;
@@ -161,7 +162,8 @@ public class DialtactsActivity extends TransactionSafeActivity
         PhoneNumberInteraction.InteractionErrorListener,
         PhoneNumberInteraction.DisambigDialogDismissedListener,
         ActivityCompat.OnRequestPermissionsResultCallback,
-        DialpadListener {
+        DialpadListener,
+        SearchFragmentListTouchListener {
 
   public static final boolean DEBUG = false;
   @VisibleForTesting public static final String TAG_DIALPAD_FRAGMENT = "dialpad";
@@ -1650,6 +1652,17 @@ public class DialtactsActivity extends TransactionSafeActivity
         : CallInitiationType.Type.REGULAR_SEARCH;
   }
 
+  @Override
+  public boolean onSearchListTouch(MotionEvent event) {
+    if (mIsDialpadShown) {
+      hideDialpadFragment(true, false);
+      if (TextUtils.isEmpty(mDialpadQuery)) {
+        exitSearchUi();
+      }
+    }
+    return false;
+  }
+
   /** Popup menu accessible from the search bar */
   protected class OptionsPopupMenu extends PopupMenu {
 
-- 
cgit v1.2.3