am 5eb7c9d3: Merge change Ifc9162c5 into eclair

Merge commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d' into eclair-plus-aosp

* commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d':
  Fix padding around QuickContactBadge in ContactHeaderWidget
This commit is contained in:
Evan Millar
2009-09-30 21:13:59 -07:00
committed by Android Git Automerger

View File

@@ -23,10 +23,9 @@
android:paddingRight="5dip"> android:paddingRight="5dip">
<android.widget.QuickContactBadge android:id="@+id/photo" <android.widget.QuickContactBadge android:id="@+id/photo"
android:layout_alignParentLeft="true"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="10dip" android:layout_marginRight="8dip"
android:layout_marginLeft="10dip" android:layout_marginLeft="-1dip"
style="@*android:style/Widget.QuickContactBadge.WindowSmall" /> style="@*android:style/Widget.QuickContactBadge.WindowSmall" />
/> />
@@ -60,7 +59,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="1" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_marginTop="-4dip" android:layout_marginTop="-4dip"
/> />