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

Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9

This commit is contained in:
Mark Wei 2013-04-04 00:47:57 +00:00 committed by Android (Google) Code Review
parent cca79c7d72 d7970b3635
commit 30dec61dbd
2 changed files with 84 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/conversation_item_view_normal.xml
View File

@ -99,4 +99,12 @@
style="@style/StarStyle"
android:src="@drawable/btn_star_off_normal_email_holo_light" />
</LinearLayout>
<ImageView
android:id="@+id/attachment_previews"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/attachment_preview_margin_top"
android:layout_marginLeft="@dimen/attachment_preview_margin_side"
android:layout_marginRight="@dimen/attachment_preview_margin_side"
android:visibility="gone" />
</LinearLayout>

139
res/layout/conversation_item_view_wide.xml
View File

@ -26,75 +26,88 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="64sp"
android:orientation="horizontal">
<ImageView
android:id="@+id/checkmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/btn_check_on_normal_holo_light" />
<TextView
android:id="@+id/senders"
android:layout_width="224dip"
android:layout_height="wrap_content"
android:text="@string/long_string"
android:textSize="@dimen/wide_senders_font_size"
android:layout_gravity="center_vertical"
android:maxLines="2"
android:layout_marginTop="@dimen/wide_senders_margin_top" />
<ImageView
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_badge_reply_holo_light" />
<TextView
android:id="@+id/subject"
android:layout_width="0dip"
android:layout_weight="0.7"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/long_string"
android:lines="2"
android:textColor="@color/subject_text_color_unread"
android:textSize="@dimen/wide_subject_font_size"
android:layout_marginTop="2sp"
android:layout_marginRight="@dimen/wide_subject_margin_right"/>
android:orientation="vertical" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:orientation="horizontal">
<ImageView
android:id="@+id/checkmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/paperclip"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/btn_check_on_normal_holo_light" />
<TextView
android:id="@+id/senders"
android:layout_width="224dip"
android:layout_height="wrap_content"
android:text="@string/long_string"
android:textSize="@dimen/wide_senders_font_size"
android:layout_gravity="center_vertical"
android:maxLines="2"
android:layout_marginTop="@dimen/wide_senders_margin_top" />
<ImageView
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_badge_reply_holo_light" />
<TextView
android:id="@+id/subject"
android:layout_width="0dip"
android:layout_weight="0.7"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/long_string"
android:lines="2"
android:textColor="@color/subject_text_color_unread"
android:textSize="@dimen/wide_subject_font_size"
android:layout_marginTop="2sp"
android:layout_marginRight="@dimen/wide_subject_margin_right"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_attachment_holo_light"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/wide_attachment_margin_top"/>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/date"
android:layout_marginTop="@dimen/wide_date_margin_top" />
android:orientation="horizontal"
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/paperclip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_attachment_holo_light"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/wide_attachment_margin_top"/>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/date"
android:layout_marginTop="@dimen/wide_date_margin_top" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/btn_star_off_normal_email_holo_light" />
</LinearLayout>
<ImageView
android:id="@+id/star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
android:src="@drawable/btn_star_off_normal_email_holo_light" />
</LinearLayout>
android:id="@+id/attachment_previews"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/attachment_preview_margin_top"
android:layout_marginLeft="@dimen/attachment_preview_margin_side"
android:layout_marginRight="@dimen/attachment_preview_margin_side"
android:visibility="gone" />
</LinearLayout>