1 files changed, 40 insertions, 11 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 093f866fc..22854311d 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,14 +21,43 @@
     android:layout_height="wrap_content"
     android:minHeight="72dp">
 
-  <QuickContactBadge
-      android:id="@+id/quick_contact_photo"
-      android:layout_width="40dp"
-      android:layout_height="40dp"
-      android:layout_marginStart="16dp"
-      android:layout_marginEnd="16dp"
-      android:layout_centerVertical="true"
-      android:focusable="true"/>
+  <!-- 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>
 
   <!-- The frame layout is necessary to avoid clipping the icons and ellipsize the text when the
        content is too wide to fit.
@@ -37,7 +66,7 @@
       android:id="@+id/primary_row"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toEndOf="@+id/contact_photo_container"
       android:layout_toStartOf="@+id/menu_button">
 
     <LinearLayout
@@ -98,7 +127,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_below="@+id/primary_row"
-      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toEndOf="@+id/contact_photo_container"
       android:orientation="horizontal">
 
     <ImageView
@@ -124,7 +153,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_below="@+id/secondary_row"
-      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toEndOf="@+id/contact_photo_container"
       android:ellipsize="end"
       android:singleLine="true"
       android:visibility="gone"/>