Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Bug:2542703
Bug:2549485

Change-Id: Ic2b88fd405043c2869610c9495bd4aa860b5c025
diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java
index 242f12e..ec79a50 100644
--- a/core/java/com/android/internal/widget/ContactHeaderWidget.java
+++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java
@@ -175,7 +175,6 @@
 
         mDisplayNameView = (TextView) findViewById(R.id.name);
         mAggregateBadge = findViewById(R.id.aggregate_badge);
-        mAggregateBadge.setVisibility(View.GONE);
 
         mPhoneticNameView = (TextView) findViewById(R.id.phonetic_name);
 
diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml
index ecbe41b..bf467d3 100644
--- a/core/res/res/layout/contact_header.xml
+++ b/core/res/res/layout/contact_header.xml
@@ -48,6 +48,7 @@
                 android:paddingRight="3dip"
                 android:paddingTop="3dip"
                 android:src="@drawable/ic_aggregated"
+                android:visibility="gone"
             />
 
             <TextView android:id="@+id/name"
@@ -59,7 +60,6 @@
                 android:textStyle="bold"
                 android:shadowColor="#BB000000"
                 android:shadowRadius="2.75"
-                android:layout_marginBottom="-4dip"
                 />
         </LinearLayout>
 
@@ -70,6 +70,7 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_marginTop="-2dip"
+            android:visibility="gone"
         />
 
         <TextView android:id="@+id/status"
@@ -79,6 +80,7 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_marginTop="-2dip"
+            android:visibility="gone"
         />
 
         <TextView android:id="@+id/status_date"
@@ -88,6 +90,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textSize="12sp"
             android:layout_marginTop="-2dip"
+            android:visibility="gone"
         />
     </LinearLayout>
 
@@ -97,7 +100,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:paddingLeft="3dip"
-        android:paddingRight="6dip"/>
+        android:paddingRight="6dip"
+        android:visibility="gone"
+    />
 
     <CheckBox
         android:id="@+id/star"