Merge "Add magnifying glass to search box."

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 6fdf5499e..2b66355cf 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -190,6 +190,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
     private String mPendingSearchViewQuery;
 
     private EditText mSearchView;
+    private View mSearchIcon;
     private View mSearchViewCloseButton;
     private View mVoiceSearchButton;
 
@@ -334,6 +335,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         SearchEditTextLayout actionBarView = (SearchEditTextLayout) actionBar.getCustomView();
         actionBarView.setPreImeKeyListener(mSearchEditTextLayoutListener);
 
+        mSearchIcon = actionBarView.findViewById(R.id.search_magnifying_glass);
+
         mSearchView = (EditText) actionBarView.findViewById(R.id.search_view);
         mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener);
         mSearchView.setOnTouchListener(mSearchViewOnTouchListener);
@@ -604,6 +607,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         }
 
         mListsFragment.maybeShowActionBar();
+        if (isInSearchUi()) {
+            mSearchIcon.setVisibility(View.GONE);
+        }
     }
 
     /**
@@ -810,6 +816,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         transaction.commit();
 
         mListsFragment.getView().animate().alpha(0).withLayer();
+
+        if (!mIsDialpadShown) {
+            mSearchIcon.setVisibility(View.GONE);
+        }
     }
 
     /**
@@ -837,6 +847,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         transaction.commit();
 
         mListsFragment.getView().animate().alpha(1).withLayer();
+        mSearchIcon.setVisibility(View.VISIBLE);
     }
 
     /** Returns an Intent to launch Call Settings screen */