Search: Show FAB in the right place

Previously, the fab would appear and dissapear whenever the user
performed certain actions. Sometimes, the fab was in the wrong place
as well.

Change-Id: I9f3559e646f8154cf48e9c7e3386063970db8e40
Ticket: CD-552

1 files changed, 2 insertions, 7 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 81c6bbeac..2ccb8cc84 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -503,9 +503,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
                 if (TextUtils.isEmpty(mSearchView.getText().toString())) {
                     // If the search term is empty, close the search UI.
                     maybeExitSearchUi();
-                } else {
-                    // If the search term is not empty, show the dialpad fab.
-                    showFabInSearchUi();
                 }
             }
             return false;
@@ -564,10 +561,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
             }
 
             @Override
-            public void onSearchViewClicked() {
-                // Hide FAB, as the keyboard is shown.
-                mFloatingActionButtonController.scaleOut();
-            }
+            public void onSearchViewClicked() {}
         });
 
         mIsLandscape = getResources().getConfiguration().orientation
@@ -1215,6 +1209,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         if (animate) {
             mListsFragment.getView().animate().alpha(0).withLayer();
         }
+        moveFabInSearchUI();
 
         mListsFragment.setUserVisibleHint(false);
     }