summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-10-14 02:30:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-14 02:30:19 +0000
commitf09b9f8f65c5dfd6ffff7526648ce7306f12f0c5 (patch)
tree65811cedf7eabf44e94d8f6f4f96162182f2d4bd /java/com/android/dialer/app
parent65aa3b3677537974f2136c702828d70a60fe6361 (diff)
parentc37701295f8a4552f5d92437c8bbcf481495b06b (diff)
Merge "Bug fixes for new search ui w/ Dialpad."
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r--java/com/android/dialer/app/DialtactsActivity.java15
1 files changed, 14 insertions, 1 deletions
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 {