|
1 |
| -<?xml version="1.0" encoding="utf-8"?> |
2 |
| -<!-- |
| 1 | +<?xml version="1.0" encoding="utf-8"?><!-- |
3 | 2 | Copyright (C) 2015 The Android Open Source Project
|
4 | 3 |
|
5 | 4 | Licensed under the Apache License, Version 2.0 (the "License");
|
|
14 | 13 | See the License for the specific language governing permissions and
|
15 | 14 | limitations under the License.
|
16 | 15 | -->
|
17 |
| -<com.android.messaging.ui.contact.ContactListItemView |
18 |
| - xmlns:android="http://schemas.android.com/apk/res/android" |
| 16 | +<com.android.messaging.ui.contact.ContactListItemView xmlns:android="http://schemas.android.com/apk/res/android" |
19 | 17 | xmlns:app="http://schemas.android.com/apk/res-auto"
|
20 | 18 | style="@style/ContactListItemViewStyle"
|
21 |
| - android:orientation="horizontal" |
22 | 19 | android:layout_width="match_parent"
|
23 | 20 | android:layout_height="wrap_content"
|
| 21 | + android:background="?android:attr/selectableItemBackground" |
| 22 | + android:orientation="horizontal" |
24 | 23 | android:paddingTop="8dp"
|
25 |
| - android:paddingBottom="8dp" |
26 |
| - android:background="?android:attr/selectableItemBackground"> |
| 24 | + android:paddingBottom="8dp"> |
27 | 25 |
|
28 | 26 | <TextView
|
29 |
| - style="@style/ContactListAlphabetHeader" |
30 | 27 | android:id="@+id/alphabet_header"
|
31 |
| - android:layout_height="wrap_content" |
| 28 | + style="@style/ContactListAlphabetHeader" |
32 | 29 | android:layout_width="56dp"
|
| 30 | + android:layout_height="wrap_content" |
33 | 31 | android:layout_gravity="center_vertical"
|
34 | 32 | android:visibility="gone" />
|
35 | 33 |
|
|
42 | 40 | android:id="@+id/contact_icon"
|
43 | 41 | android:layout_width="@dimen/contact_list_icon_size"
|
44 | 42 | android:layout_height="@dimen/contact_list_icon_size"
|
| 43 | + android:clickable="true" |
45 | 44 | android:importantForAccessibility="no"
|
46 |
| - app:iconSize="normal" |
47 |
| - android:clickable="true" /> |
| 45 | + app:iconSize="normal" /> |
48 | 46 |
|
49 | 47 | <ImageView
|
50 | 48 | android:id="@+id/contact_checkmark"
|
51 | 49 | android:layout_width="@dimen/contact_list_icon_size"
|
52 | 50 | android:layout_height="@dimen/contact_list_icon_size"
|
53 |
| - android:src="@drawable/ic_checkmark_circle_blue" |
54 |
| - android:visibility="gone" |
| 51 | + android:background="@drawable/circle_bg" |
| 52 | + android:backgroundTint="@color/colorAccent" |
| 53 | + android:contentDescription="@null" |
55 | 54 | android:importantForAccessibility="no"
|
56 |
| - android:contentDescription="@null"/> |
| 55 | + android:padding="8dp" |
| 56 | + android:src="@drawable/ic_selected" |
| 57 | + android:visibility="gone" /> |
57 | 58 |
|
58 | 59 | </FrameLayout>
|
59 | 60 |
|
60 | 61 | <LinearLayout
|
61 |
| - android:orientation="vertical" |
62 | 62 | style="@style/ContactListItemLinearLayoutStyle"
|
63 | 63 | android:layout_width="match_parent"
|
64 | 64 | android:layout_height="wrap_content"
|
65 |
| - android:layout_gravity="center_vertical" > |
| 65 | + android:layout_gravity="center_vertical" |
| 66 | + android:orientation="vertical"> |
| 67 | + |
| 68 | + <LinearLayout |
| 69 | + android:layout_width="match_parent" |
| 70 | + android:layout_height="wrap_content" |
| 71 | + android:orientation="horizontal"> |
66 | 72 |
|
67 |
| - <LinearLayout |
68 |
| - android:orientation="horizontal" |
69 |
| - android:layout_width="match_parent" |
70 |
| - android:layout_height="wrap_content"> |
71 | 73 | <TextView
|
72 | 74 | android:id="@+id/contact_name"
|
| 75 | + style="@style/ContactListItem" |
73 | 76 | android:layout_width="wrap_content"
|
74 | 77 | android:layout_height="wrap_content"
|
75 | 78 | android:layout_weight="1"
|
76 |
| - android:paddingBottom="4dp" |
77 |
| - android:singleLine="true" |
78 |
| - android:maxLines="1" |
79 | 79 | android:ellipsize="end"
|
80 |
| - style="@style/ContactListItem" /> |
| 80 | + android:maxLines="1" |
| 81 | + android:paddingBottom="4dp" |
| 82 | + android:singleLine="true" /> |
81 | 83 |
|
82 |
| - <ImageView android:id="@+id/work_profile_icon" |
83 |
| - android:src="@drawable/ic_work_profile" |
| 84 | + <ImageView |
| 85 | + android:id="@+id/work_profile_icon" |
84 | 86 | android:layout_width="wrap_content"
|
85 | 87 | android:layout_height="wrap_content"
|
86 |
| - android:scaleType="center" |
87 | 88 | android:layout_gravity="center_vertical"
|
| 89 | + android:scaleType="center" |
| 90 | + android:src="@drawable/ic_work_profile" |
88 | 91 | android:visibility="gone" />
|
89 | 92 | </LinearLayout>
|
90 | 93 |
|
91 | 94 | <LinearLayout
|
92 |
| - android:orientation="horizontal" |
93 | 95 | android:layout_width="match_parent"
|
94 |
| - android:layout_height="wrap_content"> |
| 96 | + android:layout_height="wrap_content" |
| 97 | + android:orientation="horizontal"> |
| 98 | + |
95 | 99 | <TextView
|
96 | 100 | android:id="@+id/contact_details"
|
| 101 | + style="@style/ContactListItemDetail" |
97 | 102 | android:layout_width="0dp"
|
98 |
| - android:layout_weight="1" |
99 | 103 | android:layout_height="wrap_content"
|
100 |
| - android:singleLine="true" |
101 |
| - android:maxLines="1" |
| 104 | + android:layout_weight="1" |
102 | 105 | android:ellipsize="end"
|
103 |
| - style="@style/ContactListItemDetail" /> |
| 106 | + android:maxLines="1" |
| 107 | + android:singleLine="true" /> |
104 | 108 |
|
105 | 109 | <TextView
|
106 | 110 | android:id="@+id/contact_detail_type"
|
| 111 | + style="@style/ContactListItemDetailType" |
107 | 112 | android:layout_width="wrap_content"
|
108 |
| - android:layout_height="wrap_content" |
109 |
| - style="@style/ContactListItemDetailType" /> |
| 113 | + android:layout_height="wrap_content" /> |
110 | 114 | </LinearLayout>
|
111 | 115 | </LinearLayout>
|
112 | 116 | </com.android.messaging.ui.contact.ContactListItemView>
|
0 commit comments