ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Vertically center checkboxes for phones with first line of subject. 

Fixes b/5521010 conversation list items: checkbox not centered
Fixes b/5591310 Email crashed twice while trying to compose an email in POP/Exchange
Change-Id: I8a6bd28add83ee32906274d730d222ea75c44cb1
This commit is contained in:
Mindy Pereira 2011-11-09 09:03:15 -08:00
parent 6de1470bd8
commit dbfcbd7541
4 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
res/layout/message_compose.xml
View File

@ -53,41 +53,7 @@
</LinearLayout>
<include layout="@layout/compose_body"/>
<!-- quoted text bar -->
<RelativeLayout
android:id="@+id/quoted_text_bar"
android:layout_width="match_parent"
android:layout_height="45dip"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_quoted_text_label"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
/>
<CheckBox
android:id="@+id/include_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/include_quoted_text"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_include_quoted_text_checkbox_label"
/>
</RelativeLayout>
<WebView android:id="@+id/quoted_text"
android:layout_height="wrap_content"
android:layout_width="match_parent"
/>
<include layout="@layout/quoted_text"/>
</LinearLayout>
</ScrollView>
</LinearLayout>

25
res/layout/message_list_item_normal.xml
View File

@ -31,23 +31,24 @@
android:paddingLeft="8dip"
android:paddingRight="8dip"
>
<ImageView
android:id="@+id/checkmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:src="@drawable/btn_check_on_normal_holo_light"
/>
<ImageView
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_list_icon_padding_compensation"
android:layout_centerHorizontal="true"
android:layout_above="@+id/checkmark"
android:layout_marginTop="@dimen/replystate_margin_top"
android:layout_marginLeft="@dimen/replystate_margin_left"
android:layout_alignParentTop="true"
android:src="@drawable/ic_badge_reply_holo_light"
/>
<ImageView
android:id="@+id/checkmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/btn_check_on_normal_holo_light"
android:layout_marginTop="@dimen/checkmark_margin_top"
android:layout_below="@id/reply_state"
/>
</RelativeLayout>
<!-- No top padding, since the color chips have no padding -
@ -71,7 +72,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginTop="@dimen/star_margin_top"
android:src="@drawable/btn_star_off_normal_email_holo_light" />
<LinearLayout

5
res/values-sw600dp/dimensions.xml
View File

@ -58,4 +58,9 @@
<dimen name="mailbox_list_padding_right">24dip</dimen>
<dimen name="mailbox_list_count_margin_left">16dip</dimen>
<!-- Message list items -->
<dimen name="replystate_margin_left">7dip</dimen>
<dimen name="replystate_margin_top">10sp</dimen>
<dimen name="checkmark_margin_top">4sp</dimen>
<dimen name="star_margin_top">30sp</dimen>
</resources>

7
res/values/dimensions.xml
View File

@ -73,4 +73,11 @@
<dimen name="mailbox_list_padding_left">8dip</dimen>
<dimen name="mailbox_list_padding_right">16dip</dimen>
<dimen name="mailbox_list_count_margin_left">8dip</dimen>
<!-- Message list items -->
<dimen name="replystate_margin_left">0dip</dimen>
<dimen name="replystate_margin_top">10sp</dimen>
<dimen name="checkmark_margin_top">3sp</dimen>
<dimen name="star_margin_top">28sp</dimen>
</resources>