summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-28 16:38:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-28 16:38:47 +0000
commited058349a636243714db0f53d441591cbf00410a (patch)
treea276a97a677ac1c8b07557f0bf8b51397fa885b7
parent601eadd8518b2a3683c50850af2a6db8147ec61a (diff)
parentdeab5c531563fb45aaec9305302faa46d9cbcf04 (diff)
Merge "Fix bug in FAB action" into mnc-dev
-rw-r--r--src/com/android/dialer/DialtactsActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 98f34b57d..69cc14673 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -608,7 +608,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
public void onClick(View view) {
switch (view.getId()) {
case R.id.floating_action_button:
- if (mListsFragment.getCurrentTabIndex() == ListsFragment.TAB_INDEX_ALL_CONTACTS) {
+ if (mListsFragment.getCurrentTabIndex()
+ == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch) {
DialerUtils.startActivityWithErrorToast(
this,
IntentUtil.getNewContactIntent(),