diff options
author | Yorke Lee <yorkelee@google.com> | 2013-11-13 17:24:22 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 17:24:22 -0800 |
commit | b48e45496dd75bb7de73327a5a238dc8e19dc91d (patch) | |
tree | 9f12b14c679ab9d58113ecd7ea613ea0abcae696 /res | |
parent | 1cc54f025ca77481f5346042a7eb107111158fc8 (diff) | |
parent | 550e61cf2e0f51c62e0fe0d82a54e4962482f995 (diff) |
am 550e61cf: am 59a39432: Merge "Change all contacts button to look like list item" into klp-dev
* commit '550e61cf2e0f51c62e0fe0d82a54e4962482f995':
Change all contacts button to look like list item
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/list_item_avatar_bg.png | bin | 614 -> 1128 bytes | |||
-rw-r--r-- | res/drawable-mdpi/list_item_avatar_bg.png | bin | 498 -> 1065 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/list_item_avatar_bg.png | bin | 705 -> 1225 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/list_item_avatar_bg.png | bin | 1465 -> 1382 bytes | |||
-rw-r--r-- | res/layout/show_all_contact_button.xml | 23 |
5 files changed, 2 insertions, 21 deletions
diff --git a/res/drawable-hdpi/list_item_avatar_bg.png b/res/drawable-hdpi/list_item_avatar_bg.png Binary files differindex e6eb68e27..66e5f3efe 100644 --- a/res/drawable-hdpi/list_item_avatar_bg.png +++ b/res/drawable-hdpi/list_item_avatar_bg.png diff --git a/res/drawable-mdpi/list_item_avatar_bg.png b/res/drawable-mdpi/list_item_avatar_bg.png Binary files differindex 1306cfc03..640eb3e07 100644 --- a/res/drawable-mdpi/list_item_avatar_bg.png +++ b/res/drawable-mdpi/list_item_avatar_bg.png diff --git a/res/drawable-xhdpi/list_item_avatar_bg.png b/res/drawable-xhdpi/list_item_avatar_bg.png Binary files differindex 3f271a0f6..cac7fbd34 100644 --- a/res/drawable-xhdpi/list_item_avatar_bg.png +++ b/res/drawable-xhdpi/list_item_avatar_bg.png diff --git a/res/drawable-xxhdpi/list_item_avatar_bg.png b/res/drawable-xxhdpi/list_item_avatar_bg.png Binary files differindex 8b03a6561..fcfe2daaa 100644 --- a/res/drawable-xxhdpi/list_item_avatar_bg.png +++ b/res/drawable-xxhdpi/list_item_avatar_bg.png diff --git a/res/layout/show_all_contact_button.xml b/res/layout/show_all_contact_button.xml index 824d10cdb..30060d77b 100644 --- a/res/layout/show_all_contact_button.xml +++ b/res/layout/show_all_contact_button.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<LinearLayout +<com.android.contacts.common.list.ContactListItemView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/show_all_contact_button" android:orientation="horizontal" @@ -23,23 +23,4 @@ android:layout_height="match_parent" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center" - android:background="?android:attr/selectableItemBackground" - android:focusable="true"> - - <ImageView - android:layout_height="match_parent" - android:layout_width="wrap_content" - android:layout_gravity="center" - android:src="@drawable/ic_menu_all_contacts_dk" - android:layout_marginEnd="10dp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:textSize="14sp" - android:ellipsize="marquee" - android:singleLine="true" - android:text="@string/show_all_contacts_button_text" - android:textAlignment="center" - android:gravity="center"/> -</LinearLayout>
\ No newline at end of file + android:focusable="true" />
\ No newline at end of file |