summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-28 17:18:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 17:18:28 +0000
commite32de99beb1de1272a50890ad6b090f0506a9067 (patch)
tree8ffce799c1442a0c9e7bbd8759f74efdaeeea9c4
parentc00b49680025d0a1575262716d34456e03d4c37f (diff)
parent0fc67af1e66405946b3af2da3be6595c2e981648 (diff)
downloadpackages_apps_Dialer-e32de99beb1de1272a50890ad6b090f0506a9067.tar.gz
packages_apps_Dialer-e32de99beb1de1272a50890ad6b090f0506a9067.tar.bz2
packages_apps_Dialer-e32de99beb1de1272a50890ad6b090f0506a9067.zip
am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into mnc-dev
* commit '0fc67af1e66405946b3af2da3be6595c2e981648': 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(),