commit 10c93827c3603e51a1e9373a7fb55b37f4e60487
author Naoki Amano <naoki.amano@sonymobile.com> Tue Sep 13 18:56:57 2016 +0900
committer Satoshi Futemma <satoshi.futenma@sonymobile.com> Tue Oct 11 08:43:21 2016 +0900
tree f522fdb23e05a3ea745001d6c684bdec0d243451
parent 5db64dc0eaf9edaf09c43be4a304c0d1c34a7fa2

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 d063fef..441501c 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -627,7 +627,8 @@
         int resId = view.getId();
         if (resId == R.id.floating_action_button) {
             if (mListsFragment.getCurrentTabIndex()
-                    == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch) {
+                    == ListsFragment.TAB_INDEX_ALL_CONTACTS && !mInRegularSearch &&
+                    !mInDialpadSearch) {
                 DialerUtils.startActivityWithErrorToast(
                         this,
                         IntentUtil.getNewContactIntent(),
@@ -1342,7 +1343,8 @@
         updateMissedCalls();
         int tabIndex = mListsFragment.getCurrentTabIndex();
         mPreviouslySelectedTabIndex = tabIndex;
-        if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS) {
+        if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS &&
+                !mInRegularSearch && !mInDialpadSearch) {
             mFloatingActionButtonController.changeIcon(
                     getResources().getDrawable(R.drawable.ic_person_add_24dp),
                     getResources().getString(R.string.search_shortcut_create_new_contact));