1 files changed, 18 insertions, 23 deletions
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index 8dbe96117..b880e0ffc 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -17,23 +17,23 @@
 
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     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_marginTop="16dp"
-      android:layout_marginStart="16dp"
-      android:layout_marginEnd="16dp"
-      android:focusable="true"/>
+  <com.android.dialer.widget.ContactPhotoView
+      android:id="@+id/contact_photo_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="12dp"
+      android:layout_marginStart="8dp"
+      android:layout_marginEnd="8dp"/>
 
   <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toEndOf="@+id/contact_photo_view"
       android:layout_toStartOf="@+id/menu_button"
       android:orientation="vertical">
 
@@ -42,9 +42,8 @@
         style="@style/PrimaryText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginEnd="6dp"
         android:layout_marginTop="14dp"
+        android:layout_marginEnd="6dp"
         android:ellipsize="end"
         android:lineSpacingMultiplier="1.5"
         android:singleLine="true"/>
@@ -52,16 +51,18 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
 
       <ImageView
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_voicemail_vd_theme_24"
           android:tint="@color/dialtacts_theme_color"
           android:tintMode="multiply"
-          />
+          tools:ignore="ContentDescription"/>
 
       <TextView
           android:id="@+id/secondary_text"
@@ -97,22 +98,16 @@
         android:id="@+id/new_voicemail_media_player"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        />
-
+        android:visibility="gone"/>
   </LinearLayout>
 
   <ImageView
       android:id="@+id/menu_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="12dp"
-      android:layout_marginBottom="12dp"
-      android:layout_marginStart="4dp"
-      android:layout_marginEnd="4dp"
+      android:layout_width="56dp"
+      android:layout_height="72dp"
       android:layout_alignParentEnd="true"
-      android:padding="12dp"
       android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:contentDescription="@string/a11y_voicemail_entry_expand_menu"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
       android:tint="@color/dialer_secondary_text_color"/>