commit e168610d084af59039c222e0b6c54505162cfe66
author Naoki Amano <naoki.amano@sonymobile.com> Tue Sep 13 18:56:57 2016 +0900
committer Jackeagle <jackeagle102@gmail.com> Thu Mar 02 11:14:16 2017 -0500
tree 61155a90a37af84d4a9ffb50afb63eda9d26a658
parent 4af8c7db4fd52decc3cf0d3538f5a50473b8d7dc

Fixed Dial fab changed to add to contact when multiwindow mode

Added check whether DialtactActivity is in search mode or not.

Change-Id: I621a9f6b2a419a3cfaa0f2e3e117b41143cdcce8

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 2ae567f..08cb8cb 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -696,7 +696,8 @@
                 mDialpadFragment.showDialConference(false);
             }
             if (mListsFragment.getCurrentTabIndex()
-                    == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch) {
+                    == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch &&
+                    !mInDialpadSearch) {
                 DialerUtils.startActivityWithErrorToast(
                         this,
                         IntentUtil.getNewContactIntent(),
@@ -1485,7 +1486,8 @@
         updateMissedCalls();
         int tabIndex = mListsFragment.getCurrentTabIndex();
         mPreviouslySelectedTabIndex = tabIndex;
-        if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS) {
+        if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS &&
+                !mInRegularSearch && !mInDialpadSearch) {
             setConferenceDialButtonVisibility(false);
             mFloatingActionButtonController.changeIcon(
                     getResources().getDrawable(R.drawable.ic_person_add_24dp),