summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-28 17:40:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 17:40:08 +0000
commit052597e2ffd41c9345e0ea6573c80eb880b13667 (patch)
treea9e7f3450c6125b27d015fa6a0f7a163d4535c87
parentf5295b114e0218534ffdb60a650f41efe1fda56d (diff)
parente32de99beb1de1272a50890ad6b090f0506a9067 (diff)
downloadandroid_packages_apps_Dialer-052597e2ffd41c9345e0ea6573c80eb880b13667.tar.gz
android_packages_apps_Dialer-052597e2ffd41c9345e0ea6573c80eb880b13667.tar.bz2
android_packages_apps_Dialer-052597e2ffd41c9345e0ea6573c80eb880b13667.zip
am e32de99b: am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into mnc-dev
* commit 'e32de99beb1de1272a50890ad6b090f0506a9067': 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(),