Merge "Replace 9patch with shadow on searchbox with elevated view"
diff --git a/res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-hdpi/rounded_corner_bg.9.png
similarity index 100%
rename from res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png
rename to res/drawable-hdpi/rounded_corner_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/search_bg.9.png b/res/drawable-hdpi/search_bg.9.png
deleted file mode 100644
index 81c47be..0000000
--- a/res/drawable-hdpi/search_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-mdpi/rounded_corner_bg.9.png
similarity index 100%
rename from res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png
rename to res/drawable-mdpi/rounded_corner_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/search_bg.9.png b/res/drawable-mdpi/search_bg.9.png
deleted file mode 100644
index 879aeaa..0000000
--- a/res/drawable-mdpi/search_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xhdpi/rounded_corner_bg.9.png
similarity index 100%
rename from res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png
rename to res/drawable-xhdpi/rounded_corner_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/search_bg.9.png b/res/drawable-xhdpi/search_bg.9.png
deleted file mode 100644
index 9d2d9ae..0000000
--- a/res/drawable-xhdpi/search_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png b/res/drawable-xxhdpi/rounded_corner_bg.9.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png
rename to res/drawable-xxhdpi/rounded_corner_bg.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/search_bg.9.png b/res/drawable-xxhdpi/search_bg.9.png
deleted file mode 100644
index 2f4f4b6..0000000
--- a/res/drawable-xxhdpi/search_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index 3a8e3d7..03c5106 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"
@@ -61,4 +62,4 @@
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_overflow_menu"
android:tint="@color/searchbox_options_menu_color" />
-</view>
\ No newline at end of file
+</view>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8ceda62..6d7aa84 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 59a5ca2..b4266d3 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -203,7 +203,7 @@
@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,
