- More work on avatars.

app/src/main/res/layout/contact_row.xml

@@ -1,31 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/contactRow"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal" >
 
     <TextView
-        android:id="@+id/avatar"
+        android:id="@+id/TextAvatar"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_centerVertical="true"
         android:scaleType="centerInside"
         android:background="@drawable/circle"
         android:textSize="24sp"
-        android:textStyle="bold"
         android:textAllCaps="true"
         android:textColor="@android:color/white"
         android:gravity="center" >
     </TextView>
 
+    <android.support.v7.widget.CardView
+        android:id="@+id/CardAvatar"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_gravity="center_vertical"
+        android:elevation="12dp"
+        app:cardCornerRadius="18dp" >
+
+        <ImageView
+            android:id="@+id/ImageAvatar"
+            android:layout_height="36dp"
+            android:layout_width="36dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop" >
+        </ImageView>
+
+    </android.support.v7.widget.CardView>
+
     <TextView
         android:id="@+id/contactName"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/avatar"
-        android:layout_marginStart="5dp"
+        android:layout_marginStart="41dp"
         android:textSize="20sp"
         android:layout_marginBottom="6dp">
     </TextView>