Pixel-perfect fixes for the call details.

- Fix spacing when voicemail or call/SMS are not available.
- Fix font sizes and use textAppearance wherever possible.
- Fix bug with label not appearing in call/SMS.
- Do not show the label if the name is not present.
- Remove dedicated field for phone number in call/SMS (it is not used).

Bug: 5157649
Change-Id: I32b78236b3f85e4a087545ec993f9794093e48b1
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 714bbd8..157c761 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -83,6 +83,7 @@
             android:id="@+id/voicemail_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/call_log_icon_margin"
             android:layout_below="@id/blue_separator"
             android:background="@android:color/black"
         >
@@ -118,7 +119,7 @@
             android:layout_marginLeft="@dimen/call_detail_contact_name_margin"
             android:gravity="center_vertical"
             android:textColor="?attr/call_log_primary_text_color"
-            android:textSize="18sp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:singleLine="true"
         />
         <ImageButton
@@ -134,6 +135,7 @@
         <FrameLayout android:id="@+id/call_and_sms_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/call_log_icon_margin"
             android:layout_below="@id/voicemail_container"
             android:background="@android:color/black"
         >
@@ -142,7 +144,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/call_log_list_item_height"
                 android:orientation="horizontal"
-                android:layout_marginTop="@dimen/call_log_icon_margin"
                 android:gravity="center_vertical"
                 android:background="@drawable/dialpad_background"
             >
@@ -158,31 +159,18 @@
                     android:background="@drawable/btn_dial"
                 >
 
-                    <TextView android:id="@+id/call_and_sms_text1"
+                    <TextView android:id="@+id/call_and_sms_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
                     />
 
-                    <LinearLayout android:id="@+id/call_and_sms_line2"
+                    <TextView android:id="@+id/call_and_sms_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                    >
-                        <TextView android:id="@+id/call_and_sms_label"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="5dip"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textStyle="bold"
-                        />
-
-                        <TextView android:id="@+id/call_and_sms_number"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                        />
-                    </LinearLayout>
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textAllCaps="true"
+                    />
 
                 </LinearLayout>