Don't always show FAB after stopping search or selection

Bug 28505361
Bug 29905068

Change-Id: I4f32ac6db89032f39b50c1904dd1a7468dc56b0d
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 4d827bd..a0ceed0 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -541,13 +541,13 @@
                 startSearchOrSelectionMode();
                 break;
             case ActionBarAdapter.Listener.Action.BEGIN_STOPPING_SEARCH_AND_SELECTION_MODE:
-                showFabWithAnimation(/* showFabWithAnimation = */ true);
+                showFabWithAnimation(shouldShowFabForAccount());
                 break;
             case ActionBarAdapter.Listener.Action.STOP_SEARCH_AND_SELECTION_MODE:
                 setQueryTextToFragment("");
                 updateFragmentsVisibility();
                 invalidateOptionsMenu();
-                showFabWithAnimation(/* showFabWithAnimation = */ true);
+                showFabWithAnimation(shouldShowFabForAccount());
                 break;
             case ActionBarAdapter.Listener.Action.CHANGE_SEARCH_QUERY:
                 final String queryString = mActionBarAdapter.getQueryString();
@@ -564,7 +564,7 @@
         configureFragments(false /* from request */);
         updateFragmentsVisibility();
         invalidateOptionsMenu();
-        showFabWithAnimation(/* showFabWithAnimation = */ false);
+        showFabWithAnimation(/* showFab */ false);
     }
 
     @Override