commit 1f29f08b8cf5550e639a512540092ab00a14633f
author Yorke Lee <yorkelee@google.com> Tue Jul 28 18:50:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 18:50:02 2015 +0000
tree e64117d2423c40517060515e4a98557fb6b9946b
parent 6c95311d3ba01b477737d2a5ff662b342cdc3690
parent e10dd05600d2d7f71163ea29c7cecb4bf70cfaab

am e10dd056: am 052597e2: am e32de99b: am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into mnc-dev

* commit 'e10dd05600d2d7f71163ea29c7cecb4bf70cfaab':
  Fix bug in FAB action

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index c88f70c..ddb0927 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -611,7 +611,8 @@
     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(),