diff options
author | Yorke Lee <yorkelee@google.com> | 2014-05-19 21:08:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-19 21:08:50 +0000 |
commit | faaab2037504cd038cbae74953f9e8f401993d9d (patch) | |
tree | e0279258f2b3d4e56b25dc21835f5cf9ef8e0a01 | |
parent | 7dfd35de8022c958e3de8223d705654aebec4fc3 (diff) | |
parent | 758626883585eb77d7671d5b43d77dc13fcef686 (diff) |
Merge "Replace 9patch with shadow on searchbox with elevated view"
-rw-r--r-- | res/drawable-hdpi/rounded_corner_bg.9.png (renamed from res/drawable-hdpi/ic_tile_for_recents_and_contact_tile.9.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | res/drawable-hdpi/search_bg.9.png | bin | 587 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/rounded_corner_bg.9.png (renamed from res/drawable-mdpi/ic_tile_for_recents_and_contact_tile.9.png) | bin | 205 -> 205 bytes | |||
-rw-r--r-- | res/drawable-mdpi/search_bg.9.png | bin | 389 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/rounded_corner_bg.9.png (renamed from res/drawable-xhdpi/ic_tile_for_recents_and_contact_tile.9.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/search_bg.9.png | bin | 786 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/rounded_corner_bg.9.png (renamed from res/drawable-xxhdpi/ic_tile_for_recents_and_contact_tile.9.png) | bin | 1307 -> 1307 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/search_bg.9.png | bin | 660 -> 0 bytes | |||
-rw-r--r-- | res/layout/search_edittext.xml | 5 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | src/com/android/dialer/list/ShortcutCardsAdapter.java | 2 |
11 files changed, 6 insertions, 3 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 Binary files differindex 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 Binary files differdeleted 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 Binary files differindex 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 Binary files differdeleted 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 Binary files differindex 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 Binary files differdeleted 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 Binary files differindex 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 Binary files differdeleted 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 3a8e3d76d..03c51060e 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 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, |