0435a0775e
Create a custom view containing the bottons below MVF (delete, move, reply, etc) and let MVF own this. These buttons used to be owned by the XL activity itself, because the UI for these commands will most likely be totally different from the tablet UI, so the fragment having them looked wrong. However, this made it harder to make changes suggested by the latest mock, such as "put reply/forward in the message header". I think the buttons are semantically part of the message view anyway, so the fragment owning UI for these commands is probably the way to go. (And let's worry about the phone UI later.) Reason for the use of a custom view is that it will make it easier to make non-trivial UI changes, e.g. "combine reply, reply-all and forward and make it dropdown." Also removed obsolete TODOs from MessageListXL. Change-Id: Ibf93f4c70fe07bdbbe33d2adb6bbd2b96812830d
236 lines
11 KiB
XML
236 lines
11 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<LinearLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
>
|
|
<ScrollView
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/scrollview"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dip"
|
|
android:layout_weight="1"
|
|
android:scrollbarStyle="outsideOverlay"
|
|
android:fadingEdge="none"
|
|
android:fillViewport="true"
|
|
>
|
|
<LinearLayout
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
>
|
|
<!-- header area -->
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:background="@drawable/header_card"
|
|
android:paddingTop="3dip"
|
|
android:paddingBottom="3dip"
|
|
android:paddingLeft="3dip"
|
|
android:paddingRight="6dip">
|
|
<LinearLayout
|
|
android:id="@+id/from_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:baselineAligned="true" >
|
|
<android.widget.QuickContactBadge
|
|
android:id="@+id/badge"
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_marginRight="8dip"
|
|
android:layout_marginLeft="2dip"
|
|
style="@*android:style/Widget.QuickContactBadge.WindowSmall" />
|
|
/>
|
|
<ImageView
|
|
android:id="@+id/presence"
|
|
android:src="@drawable/presence_inactive"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginRight="5dip"
|
|
android:layout_gravity="center_vertical"
|
|
android:background="@drawable/quickcontact_presence_bg" />
|
|
<TextView
|
|
android:id="@+id/from"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
android:textStyle="bold"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1.0"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentLeft="true"
|
|
android:singleLine="true"
|
|
android:ellipsize="end"
|
|
android:paddingRight="6dip" />
|
|
<ImageView
|
|
android:id="@+id/attachment"
|
|
android:src="@drawable/ic_email_attachment_small"
|
|
android:layout_width="22dip"
|
|
android:layout_height="22dip"
|
|
android:baselineAlignBottom="true" />
|
|
<TextView
|
|
android:id="@+id/date"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="4dip"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:id="@+id/to_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" >
|
|
<TextView
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textStyle="bold"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/message_view_to_label" />
|
|
<TextView
|
|
android:id="@+id/to"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1.0"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="4dip"
|
|
android:singleLine="false"
|
|
android:ellipsize="none" />
|
|
<TextView
|
|
android:id="@+id/time"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="4dip"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:id="@+id/cc_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" >
|
|
<TextView
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textStyle="bold"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/message_view_cc_label" />
|
|
<TextView
|
|
android:id="@+id/cc"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1.0"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="4dip"
|
|
android:singleLine="false"
|
|
android:ellipsize="none" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" >
|
|
<TextView
|
|
android:id="@+id/subject"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textStyle="bold"
|
|
android:layout_width="0dip"
|
|
android:layout_weight="1.0"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="false"
|
|
android:ellipsize="none" />
|
|
<!-- TODO: Move this to wherever it really belongs -->
|
|
<ImageView
|
|
android:id="@+id/favorite"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:src="@drawable/btn_star_big_buttonless_off" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:id="@+id/show_pictures_section"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="#ffefefef"
|
|
android:layout_marginTop="6dip"
|
|
android:paddingLeft="6dip"
|
|
android:paddingRight="3dip"
|
|
android:paddingTop="4dip"
|
|
android:paddingBottom="4dip"
|
|
android:baselineAligned="false"
|
|
android:visibility="gone">
|
|
<TextView
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:text="@string/message_view_show_pictures_instructions"
|
|
android:layout_gravity="center"
|
|
android:layout_width="0dip"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1.0" />
|
|
<Button
|
|
android:id="@+id/show_pictures"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/message_view_show_pictures_action" />
|
|
</LinearLayout>
|
|
<!-- content area -->
|
|
<include layout="@layout/message_view_invitation" />
|
|
<WebView
|
|
android:id="@+id/message_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="match_parent"
|
|
android:background="#ffffff" />
|
|
<!-- attachments area -->
|
|
<LinearLayout
|
|
android:id="@+id/attachments"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="4dip"
|
|
android:background="#ffffff">
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</ScrollView>
|
|
<!--
|
|
Buttons such as delete, mark unread. Only MessageViewFragment uses these.
|
|
MessageFileViewFragment doesn't.
|
|
-->
|
|
<include
|
|
layout="@layout/message_command_button_view"
|
|
android:id="@+id/message_command_buttons"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0"
|
|
android:visibility="gone"
|
|
/>
|
|
<!--
|
|
<com.android.email.activity.MessageCommandButtonView
|
|
android:id="@+id/message_command_buttons"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="0"
|
|
android:orientation="horizontal"
|
|
android:visibility="gone"
|
|
/>
|
|
-->
|
|
</LinearLayout>
|