diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-29 01:04:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-29 01:04:55 +0000 |
| commit | 1b3cf4d73e692182efc3a87e1582505438309283 (patch) | |
| tree | b7b71bea6349e97306c9cecc200240c89a167eef /java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml | |
| parent | d72585b40d67560cb868c2ac4d6fbda2ed27454b (diff) | |
| parent | 57751c35a0d4f25a817378b0a4b1d14336a0d4e8 (diff) | |
Merge changes Ib658efa6,I0f84f15c
* changes:
Create a common widget (ContactPhotoView) for a contact photo and its optional badge.
Remove unnecessary call to StatusBarNotifier.updateNotification().
Diffstat (limited to 'java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml')
| -rw-r--r-- | java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml | 50 |
1 files changed, 10 insertions, 40 deletions
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml index 22854311d..672a9a35e 100644 --- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml @@ -21,43 +21,13 @@ android:layout_height="wrap_content" android:minHeight="72dp"> - <!-- Contact photo (including the optional video icon) --> - <FrameLayout - android:id="@+id/contact_photo_container" - android:layout_width="52dp" - android:layout_height="44dp" - android:layout_marginStart="10dp" - android:layout_marginEnd="10dp" - android:layout_centerVertical="true" - android:focusable="false"> - - <QuickContactBadge - android:id="@+id/quick_contact_photo" - android:layout_width="40dp" - android:layout_height="40dp" - android:layout_gravity="center" - android:focusable="true"/> - - <FrameLayout - android:id="@+id/contact_badge_container" - android:layout_width="22dp" - android:layout_height="22dp" - android:layout_gravity="bottom|end"> - - <ImageView - android:id="@+id/contact_badge_background" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:src="@drawable/contact_photo_badge_background"/> - - <ImageView - android:id="@+id/video_call_icon" - android:layout_width="13dp" - android:layout_height="13dp" - android:layout_gravity="center" - android:src="@drawable/quantum_ic_videocam_vd_white_24"/> - </FrameLayout> - </FrameLayout> + <com.android.dialer.widget.ContactPhotoView + android:id="@+id/contact_photo_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_centerVertical="true"/> <!-- The frame layout is necessary to avoid clipping the icons and ellipsize the text when the content is too wide to fit. @@ -66,7 +36,7 @@ android:id="@+id/primary_row" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toEndOf="@+id/contact_photo_container" + android:layout_toEndOf="@+id/contact_photo_view" android:layout_toStartOf="@+id/menu_button"> <LinearLayout @@ -127,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/primary_row" - android:layout_toEndOf="@+id/contact_photo_container" + android:layout_toEndOf="@+id/contact_photo_view" android:orientation="horizontal"> <ImageView @@ -153,7 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/secondary_row" - android:layout_toEndOf="@+id/contact_photo_container" + android:layout_toEndOf="@+id/contact_photo_view" android:ellipsize="end" android:singleLine="true" android:visibility="gone"/> |