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

* commit '30dec61dbd57ebfbdab7755d50d18471aab59178':
  Attachments in Conversation List: UI changes to display attachment previews in the conversation list.
This commit is contained in:
Mark Wei 2013-04-03 17:51:16 -07:00 committed by Android Git Automerger
commit 102df0ea66
2 changed files with 84 additions and 63 deletions

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>

View File

@ -26,6 +26,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="64sp"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ImageView
android:id="@+id/checkmark"
@ -97,4 +101,13 @@
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
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>