1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index f1a2a8803..abd7c8c83 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -765,7 +765,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
      */
     public void onDialpadShown() {
         Assert.assertNotNull(mDialpadFragment);
-        if (mDialConferenceButtonPressed) {
+        if (mDialConferenceButtonPressed || !mIsDialpadShown) {
             mFloatingActionButton.setImageResource(R.drawable.fab_ic_dial);
             mDialConferenceButtonPressed = false;
         } else {
@@ -1217,8 +1217,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                 ImsManager.isVolteEnabledByPlatform(this) &&
                 ImsManager.isEnhanced4gLteModeSettingEnabledByUser(this);
         if(mConferenceDialButton != null) {
-            mConferenceDialButton.setVisibility((enabled && imsUseEnabled) ?
-                    View.VISIBLE : View.GONE);
+            boolean isCurrentTabAllContacts = (mListsFragment != null) &&
+                    (mListsFragment.getCurrentTabIndex() == ListsFragment.TAB_INDEX_ALL_CONTACTS);
+            mConferenceDialButton.setVisibility((enabled && imsUseEnabled &&
+                    !isCurrentTabAllContacts) ? View.VISIBLE : View.GONE);
         }
     }
 
@@ -1359,10 +1361,12 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
     public void onPageSelected(int position) {
         int tabIndex = mListsFragment.getCurrentTabIndex();
         if (tabIndex == ListsFragment.TAB_INDEX_ALL_CONTACTS) {
+            setConferenceDialButtonVisibility(false);
             mFloatingActionButtonController.changeIcon(
                     getResources().getDrawable(R.drawable.ic_person_add_24dp),
                     getResources().getString(R.string.search_shortcut_create_new_contact));
         } else {
+            setConferenceDialButtonVisibility(true);
             mFloatingActionButtonController.changeIcon(
                     getResources().getDrawable(R.drawable.fab_ic_dial),
                     getResources().getString(R.string.action_menu_dialpad_button));