summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-28 16:51:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 16:51:59 +0000
commit0fc67af1e66405946b3af2da3be6595c2e981648 (patch)
treea4ee150a65dec64f6cd0fa69d7bfca6f3a8ac1e5
parentd57bb10f00dda90b2bfddc0e4d81e7e69a4937ca (diff)
parented058349a636243714db0f53d441591cbf00410a (diff)
am ed058349: Merge "Fix bug in FAB action" into mnc-dev
* commit 'ed058349a636243714db0f53d441591cbf00410a': Fix bug in FAB action
-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(),