Fix widget padding.

Makes text vertically and horizontally centered
Also makes it more robust to text size changes

Bug: 5406487
Bug: 5360657
Change-Id: I5183c988163381237cf3aa38121075b7281df695
This commit is contained in:
Ben Komalo 2011-10-04 16:23:45 -07:00
parent cd75eef4de
commit ab5ac4fd00
2 changed files with 47 additions and 40 deletions

View File

@ -14,60 +14,68 @@
limitations under the License.
-->
<LinearLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_message"
android:layout_width="match_parent"
android:layout_height="64sp"
android:paddingLeft="16dip"
android:paddingRight="8dip"
android:orientation="vertical"
android:background="@drawable/message_list_unread_selector"
>
<ImageView
android:id="@+id/color_chip"
android:layout_width="32dip"
android:layout_height="8dip"
style="@style/widget_list_item"
android:layout_gravity="right|top"
android:layout_height="4dip"
android:layout_marginRight="16dip"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:visibility="visible"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/widget_list_item"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_centerVertical="true"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:id="@+id/widget_from"
style="@style/widget_list_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingRight="16dip"
android:singleLine="true" />
<!-- Use negative margins to align attachment icon with text -->
<ImageView
android:id="@+id/widget_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-4sp"
android:src="@drawable/ic_badge_invite_holo_light" />
<ImageView
android:id="@+id/widget_attachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-4sp"
android:src="@drawable/ic_attachment_holo_light" />
<TextView
android:id="@+id/widget_date"
style="@style/widget_list_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/widget_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingRight="16dip"
android:singleLine="true" />
<!-- Use negative margins to align attachment icon with text -->
<ImageView
android:id="@+id/widget_invite"
android:layout_width="wrap_content"
android:id="@+id/widget_subject"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/widget_list_item"
android:layout_marginTop="-4sp"
android:src="@drawable/ic_badge_invite_holo_light" />
<ImageView
android:id="@+id/widget_attachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-4sp"
android:src="@drawable/ic_attachment_holo_light" />
<TextView
android:id="@+id/widget_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:maxLines="2"/>
</LinearLayout>
<TextView
android:id="@+id/widget_subject"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/widget_list_item"
android:layout_marginTop="-4sp"
android:maxLines="2"/>
</LinearLayout>
</RelativeLayout>

View File

@ -78,8 +78,7 @@
<style name="widget_list_item">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:layout_marginLeft">16dip</item>
<item name="android:layout_marginRight">8dip</item>
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
</style>
<style name="message_details_label">