Merge "Add shadow to expanded search box"

2 files changed, 2 insertions, 1 deletions

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index c164294c7..8445ff76d 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -323,6 +323,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
         final ActionBar actionBar = getActionBar();
         actionBar.setCustomView(R.layout.search_edittext);
         actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setBackgroundDrawable(null);
 
         mSearchEditTextLayout = (SearchEditTextLayout) actionBar.getCustomView();
         mSearchEditTextLayout.setPreImeKeyListener(mSearchEditTextLayoutListener);
diff --git a/src/com/android/dialer/widget/SearchEditTextLayout.java b/src/com/android/dialer/widget/SearchEditTextLayout.java
index 33bf09f59..683084211 100644
--- a/src/com/android/dialer/widget/SearchEditTextLayout.java
+++ b/src/com/android/dialer/widget/SearchEditTextLayout.java
@@ -122,7 +122,7 @@ public class SearchEditTextLayout extends FrameLayout {
         if (expand) {
             AnimationUtils.crossFadeViews(mExpanded, mCollapsed, ANIMATION_DURATION);
             animator = ValueAnimator.ofFloat(1f, 0f);
-            setBackgroundColor(mBackgroundColor);
+            setBackgroundResource(R.drawable.search_shadow);
             mSearchView.requestFocus();
         } else {
             AnimationUtils.crossFadeViews(mCollapsed, mExpanded, ANIMATION_DURATION);