Replace 9patch with shadow on searchbox with elevated view

Bug: 14900155
Change-Id: Ib315cf449a0059a11ac50ba6e5a04b15e2db35a9

11 files changed, 5 insertions, 2 deletions

diff --git a/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-hdpi/rounded_corner_bg.9.png
index b5f50de3c..b5f50de3c 100644
--- a/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png
+++ b/res/drawable-hdpi/rounded_corner_bg.9.png
diff --git a/res/drawable-hdpi/search_bg.9.png b/res/drawable-hdpi/search_bg.9.png
deleted file mode 100644
index 81c47be3b..000000000
--- a/res/drawable-hdpi/search_bg.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-mdpi/rounded_corner_bg.9.png
index e43b3efd4..e43b3efd4 100644
--- a/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png
+++ b/res/drawable-mdpi/rounded_corner_bg.9.png
diff --git a/res/drawable-mdpi/search_bg.9.png b/res/drawable-mdpi/search_bg.9.png
deleted file mode 100644
index 879aeaabd..000000000
--- a/res/drawable-mdpi/search_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xhdpi/rounded_corner_bg.9.png
index ebfe89791..ebfe89791 100644
--- a/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png
+++ b/res/drawable-xhdpi/rounded_corner_bg.9.png
diff --git a/res/drawable-xhdpi/search_bg.9.png b/res/drawable-xhdpi/search_bg.9.png
deleted file mode 100644
index 9d2d9ae5b..000000000
--- a/res/drawable-xhdpi/search_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xxhdpi/rounded_corner_bg.9.png
index 0a99cdb26..0a99cdb26 100644
--- a/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png
+++ b/res/drawable-xxhdpi/rounded_corner_bg.9.png
diff --git a/res/drawable-xxhdpi/search_bg.9.png b/res/drawable-xxhdpi/search_bg.9.png
deleted file mode 100644
index 2f4f4b688..000000000
--- a/res/drawable-xxhdpi/search_bg.9.png
+++ /dev/null
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index d18754aee..9eb2ea650 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -11,8 +11,9 @@
     android:layout_marginRight="@dimen/search_margin_horizontal"
     android:paddingLeft="@dimen/search_box_left_padding"
     android:paddingRight="@dimen/search_box_right_padding"
-    android:background="@drawable/search_bg"
+    android:background="@drawable/rounded_corner_bg"
     android:gravity="center_vertical"
+    android:elevation="@dimen/search_box_elevation"
     >
     <ImageView
         android:id="@+id/search_magnifying_glass"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8ceda625d..6d7aa84fb 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -111,6 +111,8 @@
     <dimen name="search_box_text_left_margin">8dp</dimen>
     <!-- Size of the icon (voice search, close search) in the search box. -->
     <dimen name="search_box_icon_size">28dp</dimen>
+    <!-- Elevation of the search box -->
+    <dimen name="search_box_elevation">10dp</dimen>
 
     <!-- Size of text in tabs. -->
     <dimen name="tab_height">43dp</dimen>
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index 59a5ca2bf..b4266d33d 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -203,7 +203,7 @@ public class ShortcutCardsAdapter extends BaseAdapter {
 
         @Override
         public void addView(View view) {
-            view.setBackgroundResource(R.drawable.ic_tile_for_recents_and_contact_tile);
+            view.setBackgroundResource(R.drawable.rounded_corner_bg);
 
             final FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                     FrameLayout.LayoutParams.MATCH_PARENT,