Account filter and profile header style fixes

Bugs: 5144226, 5142982

Fixed layout and style according to Marco's document:
1. Fixed style of account filter
2. Fixed style for profile header
3. Fixed contacts count to not include the profile

Change-Id: I0c6fc0f4839a993c0fede8840b7636c0460eed55
diff --git a/res/layout/contacts_list_content.xml b/res/layout/contacts_list_content.xml
index 567e63d..f98d751 100644
--- a/res/layout/contacts_list_content.xml
+++ b/res/layout/contacts_list_content.xml
@@ -41,14 +41,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/contact_filter_header_min_height"
-            android:layout_marginLeft="8dip"
             android:singleLine="true"
             android:ellipsize="end"
-            android:gravity="left"
+            android:textStyle="bold"
+            android:gravity="left|center_vertical"
+            android:textAllCaps="true"
+            android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary" />
         <View
             android:id="@+id/account_filter_header_bottom_divider"
+            android:layout_height="1dip"
             style="@style/SectionDivider" />
     </LinearLayout>
 
diff --git a/res/layout/user_profile_button.xml b/res/layout/user_profile_button.xml
index b7b5e1d..4937d7b 100644
--- a/res/layout/user_profile_button.xml
+++ b/res/layout/user_profile_button.xml
@@ -19,9 +19,10 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingLeft="@dimen/contact_browser_list_left_margin"
     android:singleLine="true"
     android:text="@string/profile_display_name"
     android:ellipsize="end"
+    android:minHeight="@dimen/contact_browser_list_item_photo_size"
     android:gravity="left|center_vertical"
+    android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
     android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index ae803ba..7c82ea4 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/contact_browser_list_bk_color"
+    android:paddingTop="@dimen/contact_browser_list_top_margin"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
@@ -30,14 +30,14 @@
             android:id="@+id/profile_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/contact_browser_list_left_margin"
             android:singleLine="true"
             android:text="@string/user_profile_contacts_list_header"
             android:textStyle="bold"
             android:ellipsize="end"
-            android:gravity="left"
+            android:gravity="left|center_vertical"
             android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
             android:textColor="@color/people_app_theme_color" />
 
         <TextView
@@ -46,15 +46,15 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
-            android:layout_gravity="right"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="right|center_vertical"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="12dip"
             android:textColor="@color/contact_count_text_color" />
     </LinearLayout>
 
     <View
         android:background="@color/people_app_theme_color"
-        android:layout_marginLeft="@dimen/contact_browser_list_left_margin"
         android:layout_width="match_parent"
-        android:layout_height="1px" />
+        android:layout_height="1dip" />
 
 </LinearLayout>
\ No newline at end of file