Fix message view for phone
- All layouts are still temporary, but at least they're usable now. - Removed reply/forward button from the bottom panel. There're buttons in the layout. - Switched to getView(). - removed the unnecessary LinearLayout from the xlarge layout. - removed some backgrounds that'll probably not be used. Change-Id: I3aa27c63ab139ae30e5714ac3d9a1eadce74b0e8
This commit is contained in:
Makoto Onuki
parent
e553c6ec0b
commit
96332096ca
@ -15,381 +15,374 @@
|
||||
-->
|
||||
|
||||
<!-- xlarge -->
|
||||
<LinearLayout
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#ffffffff"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<FrameLayout
|
||||
<ProgressBar
|
||||
android:id="@+id/loading_progress"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
style="?android:attr/progressBarStyleLarge"
|
||||
/>
|
||||
<RelativeLayout
|
||||
android:id="@+id/main_panel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="match_parent"
|
||||
>
|
||||
<ProgressBar
|
||||
android:id="@+id/loading_progress"
|
||||
<!-- Subject -->
|
||||
<TextView
|
||||
android:id="@+id/subject"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="48dip"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="0dip"
|
||||
android:layout_marginLeft="32dip"
|
||||
android:layout_marginRight="32dip"
|
||||
android:gravity="center_vertical"
|
||||
style="@style/message_view_subject"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/subject_divider"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:layout_below="@id/subject"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginLeft="16dip"
|
||||
android:layout_marginRight="16dip"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
/>
|
||||
|
||||
<!-- Badge -->
|
||||
<ImageButton
|
||||
android:id="@+id/badge"
|
||||
android:layout_width="64dip"
|
||||
android:layout_height="64dip"
|
||||
android:layout_below="@id/subject_divider"
|
||||
android:layout_alignLeft="@id/subject"
|
||||
android:padding="0dip"
|
||||
android:scaleType="fitCenter"
|
||||
/>
|
||||
<!-- Background for sender name and buttons -->
|
||||
<View
|
||||
android:id="@+id/header_background"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="64dip"
|
||||
android:layout_below="@id/subject_divider"
|
||||
android:layout_toRightOf="@id/badge"
|
||||
android:layout_alignRight="@id/subject"
|
||||
android:background="@drawable/message_header_bg"
|
||||
/>
|
||||
|
||||
<!--
|
||||
reply, reply-all, forward, Star
|
||||
These buttons can all be gone at runtime, so don't refer to individual buttons from
|
||||
other views. Instead refer to this outer layout.
|
||||
-->
|
||||
<LinearLayout
|
||||
android:id="@+id/forward_reply_buttons"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
style="?android:attr/progressBarStyleLarge"
|
||||
/>
|
||||
<RelativeLayout
|
||||
android:id="@+id/main_panel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="8dip"
|
||||
android:layout_marginLeft="0dip"
|
||||
android:layout_alignTop="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<!-- Subject -->
|
||||
<TextView
|
||||
android:id="@+id/subject"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="48dip"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="0dip"
|
||||
android:layout_marginLeft="32dip"
|
||||
android:layout_marginRight="32dip"
|
||||
android:gravity="center_vertical"
|
||||
style="@style/message_view_subject"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/subject_divider"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:layout_below="@id/subject"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginLeft="16dip"
|
||||
android:layout_marginRight="16dip"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
/>
|
||||
|
||||
<!-- Badge -->
|
||||
<ImageButton
|
||||
android:id="@+id/badge"
|
||||
android:layout_width="64dip"
|
||||
android:layout_height="64dip"
|
||||
android:layout_below="@id/subject_divider"
|
||||
android:layout_alignLeft="@id/subject"
|
||||
android:padding="0dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:id="@+id/reply"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_reply"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<!-- Background for sender name and buttons -->
|
||||
<View
|
||||
android:id="@+id/header_background"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="64dip"
|
||||
android:layout_below="@id/subject_divider"
|
||||
android:layout_toRightOf="@id/badge"
|
||||
android:layout_alignRight="@id/subject"
|
||||
android:background="@drawable/message_header_bg"
|
||||
<ImageButton
|
||||
android:id="@+id/reply_all"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_reply_all"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<ImageButton
|
||||
android:id="@+id/forward"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_forward"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<ImageButton
|
||||
android:id="@+id/favorite"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/btn_star_off_normal_email_holo_light"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!--
|
||||
reply, reply-all, forward, Star
|
||||
These buttons can all be gone at runtime, so don't refer to individual buttons from
|
||||
other views. Instead refer to this outer layout.
|
||||
-->
|
||||
<LinearLayout
|
||||
android:id="@+id/forward_reply_buttons"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dip"
|
||||
android:layout_marginLeft="0dip"
|
||||
android:layout_alignTop="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<ImageButton
|
||||
android:id="@+id/reply"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_reply"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<ImageButton
|
||||
android:id="@+id/reply_all"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_reply_all"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<ImageButton
|
||||
android:id="@+id/forward"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/ic_forward"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
<ImageButton
|
||||
android:id="@+id/favorite"
|
||||
android:layout_marginRight="16dip"
|
||||
android:src="@drawable/btn_star_off_normal_email_holo_light"
|
||||
android:visibility="gone"
|
||||
style="@style/message_view_action_buttons"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- presence, sender address, sender name: make them center_vertical -->
|
||||
<!-- presence, sender address, sender name: make them center_vertical -->
|
||||
<LinearLayout
|
||||
android:id="@+id/presence_from_name"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_alignTop="@id/header_background"
|
||||
android:layout_alignBottom="@id/header_background"
|
||||
android:layout_alignLeft="@id/header_background"
|
||||
android:layout_toLeftOf="@id/forward_reply_buttons"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_vertical"
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/presence_from_name"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_alignTop="@id/header_background"
|
||||
android:layout_alignBottom="@id/header_background"
|
||||
android:layout_alignLeft="@id/header_background"
|
||||
android:layout_toLeftOf="@id/forward_reply_buttons"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center|center_vertical"
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/presence_from_name"
|
||||
android:layout_width="match_parent"
|
||||
<!-- Presence icon -->
|
||||
<ImageView
|
||||
android:id="@+id/presence"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center|center_vertical"
|
||||
>
|
||||
<!-- Presence icon -->
|
||||
<ImageView
|
||||
android:id="@+id/presence"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:layout_marginLeft="8dip"
|
||||
android:layout_marginRight="8dip"
|
||||
android:src="@android:drawable/presence_offline"
|
||||
/>
|
||||
<!-- Sender display name -->
|
||||
<TextView
|
||||
android:id="@+id/from_name"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="18dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<!-- From address -->
|
||||
android:layout_weight="0"
|
||||
android:layout_marginLeft="8dip"
|
||||
android:layout_marginRight="8dip"
|
||||
android:src="@android:drawable/presence_offline"
|
||||
/>
|
||||
<!-- Sender display name -->
|
||||
<TextView
|
||||
android:id="@+id/from_address"
|
||||
android:layout_width="match_parent"
|
||||
android:id="@+id/from_name"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dip"
|
||||
android:layout_marginLeft="40dip"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_secondary_color"
|
||||
android:layout_weight="1"
|
||||
android:textSize="18dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Addresses, timestamp -->
|
||||
<Button
|
||||
android:id="@+id/show_details"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_marginRight="14dip"
|
||||
style="@android:style/Widget.Holo.Button.Borderless"
|
||||
android:padding="0dip"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/message_view_show_details"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
|
||||
<!-- From address -->
|
||||
<TextView
|
||||
android:text="@string/message_view_show_details"
|
||||
android:id="@+id/datetime"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_toLeftOf="@id/show_details"
|
||||
android:layout_marginRight="156dip"
|
||||
android:gravity="center_vertical"
|
||||
android:id="@+id/from_address"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dip"
|
||||
android:layout_marginLeft="40dip"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/addresses"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_toLeftOf="@id/datetime"
|
||||
android:layout_marginRight="16dip"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:textColor="@color/text_secondary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/address_divider"
|
||||
android:layout_width="0dip"
|
||||
android:layout_below="@id/show_details"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
/>
|
||||
<!-- Addresses, timestamp -->
|
||||
<Button
|
||||
android:id="@+id/show_details"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_marginRight="14dip"
|
||||
style="@android:style/Widget.Holo.Button.Borderless"
|
||||
android:padding="0dip"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/message_view_show_details"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
|
||||
<!--
|
||||
The rest: tab + body + command buttons. Use LinearLayout to easily hide part of
|
||||
them.
|
||||
-->
|
||||
<TextView
|
||||
android:text="@string/message_view_show_details"
|
||||
android:id="@+id/datetime"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_toLeftOf="@id/show_details"
|
||||
android:layout_marginRight="156dip"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
|
||||
<!-- To, Cc, Bcc addresses -->
|
||||
<TextView
|
||||
android:id="@+id/addresses"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="48dip"
|
||||
android:layout_below="@id/header_background"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_toLeftOf="@id/datetime"
|
||||
android:layout_marginRight="16dip"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/address_divider"
|
||||
android:layout_width="0dip"
|
||||
android:layout_below="@id/show_details"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
/>
|
||||
|
||||
<!--
|
||||
The rest: tab + body + command buttons. Use LinearLayout to easily hide part of
|
||||
them.
|
||||
-->
|
||||
<LinearLayout
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_below="@id/address_divider"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<!-- Tabs + divider -->
|
||||
<!-- Can't use a RelativeLayout, because tabs can be GONE -->
|
||||
<LinearLayout
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_below="@id/address_divider"
|
||||
android:layout_alignLeft="@id/badge"
|
||||
android:layout_alignRight="@id/header_background"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:id="@+id/message_tabs_section"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<!-- Tabs + divider -->
|
||||
<!-- Can't use a RelativeLayout, because tabs can be GONE -->
|
||||
<LinearLayout
|
||||
android:id="@+id/message_tabs_section"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="40dip"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dip"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<Button
|
||||
android:id="@+id/show_message"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/message_view_show_message_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_invite"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/message_view_show_invite_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_attachments"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<!-- filler -->
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_pictures"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="right"
|
||||
style="@android:style/Widget.Holo.Button.Borderless"
|
||||
android:padding="0dip"
|
||||
android:text="@string/message_view_show_pictures_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:drawableRight="@drawable/ic_show_images_holo_light"
|
||||
android:drawablePadding="8dip"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="16dip"
|
||||
android:layout_height="0dip"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<Button
|
||||
android:id="@+id/show_message"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/message_view_show_message_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_invite"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/message_view_show_invite_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_attachments"
|
||||
android:layout_width="128dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_primary_color"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
style="@android:style/Widget.Holo.Light.Tab"
|
||||
/>
|
||||
<!-- filler -->
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_pictures"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="right"
|
||||
style="@android:style/Widget.Holo.Button.Borderless"
|
||||
android:padding="0dip"
|
||||
android:text="@string/message_view_show_pictures_action"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:drawableRight="@drawable/ic_show_images_holo_light"
|
||||
android:drawablePadding="8dip"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="16dip"
|
||||
android:layout_height="0dip"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- margin -->
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="16dip"
|
||||
android:layout_width="match_parent"
|
||||
style="@style/message_view_horizontal_divider"
|
||||
/>
|
||||
|
||||
<!-- content area - only one of them is visible at a time -->
|
||||
<!-- Message body -->
|
||||
<WebView
|
||||
android:id="@+id/message_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:background="#ffffffff"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
<!-- Invite: Even though this section is only for MessageViewFragment,
|
||||
Its visibility is controlled by MessageViewFragmentBase for simplicity.
|
||||
MessageFileViewFragment shouldn't touch this. -->
|
||||
<ScrollView
|
||||
android:id="@+id/invite_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<include layout="@layout/message_view_invitation" />
|
||||
</ScrollView>
|
||||
|
||||
<!-- Attachments -->
|
||||
<ScrollView
|
||||
android:id="@+id/attachments_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/attachments"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/message_view_info_back_color"
|
||||
android:divider="?android:attr/dividerHorizontal"
|
||||
android:showDividers="beginning|middle|end"
|
||||
/>
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- margin -->
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="16dip"
|
||||
/>
|
||||
|
||||
<!-- content area - only one of them is visible at a time -->
|
||||
<!-- Message body -->
|
||||
<WebView
|
||||
android:id="@+id/message_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:background="#ffffffff"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
<!-- Invite: Even though this section is only for MessageViewFragment,
|
||||
Its visibility is controlled by MessageViewFragmentBase for simplicity.
|
||||
MessageFileViewFragment shouldn't touch this. -->
|
||||
<ScrollView
|
||||
android:id="@+id/invite_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<include layout="@layout/message_view_invitation" />
|
||||
</ScrollView>
|
||||
|
||||
<!-- Attachments -->
|
||||
<ScrollView
|
||||
android:id="@+id/attachments_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="14dip"
|
||||
android:layout_marginRight="14dip"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/attachments"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/message_view_info_back_color"
|
||||
android:divider="?android:attr/dividerHorizontal"
|
||||
android:showDividers="beginning|middle|end"
|
||||
/>
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</FrameLayout>
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<!-- Bottom buttons -->
|
||||
<LinearLayout
|
||||
android:id="@+id/button_panel"
|
||||
android:orientation="horizontal"
|
||||
@ -37,25 +36,7 @@
|
||||
android:paddingLeft="4dip"
|
||||
android:paddingRight="4dip"
|
||||
android:paddingBottom="1dip"
|
||||
android:background="@android:drawable/bottom_bar">
|
||||
<Button
|
||||
android:id="@+id/reply"
|
||||
android:text="@string/reply_action"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1" />
|
||||
<Button
|
||||
android:id="@+id/reply_all"
|
||||
android:text="@string/reply_all_action"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1" />
|
||||
<Button
|
||||
android:id="@+id/delete"
|
||||
android:text="@string/delete_action"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1" />
|
||||
>
|
||||
<Button
|
||||
android:id="@+id/moveToNewer"
|
||||
android:text="@string/message_view_move_to_newer"
|
||||
|
||||
@ -14,119 +14,104 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- Non-xlarge -->
|
||||
<!-- phone -->
|
||||
<!--
|
||||
TODO Remove the default visibility and always set them from code.
|
||||
-->
|
||||
|
||||
<FrameLayout
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="4dip">
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<ImageView
|
||||
android:id="@+id/attachment_icon"
|
||||
android:layout_width="64dip"
|
||||
android:layout_height="64dip"
|
||||
android:src="@drawable/attached_image_placeholder"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="4dip">
|
||||
<RelativeLayout
|
||||
android:orientation="vertical"
|
||||
>
|
||||
<TextView
|
||||
android:id="@+id/attachment_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/text_box"
|
||||
android:gravity="center_vertical">
|
||||
<ImageView
|
||||
android:id="@+id/attachment_icon"
|
||||
android:layout_width="62dip"
|
||||
android:layout_height="62dip"
|
||||
android:layout_marginLeft="4dip"
|
||||
android:layout_marginRight="4dip"
|
||||
android:layout_marginBottom="4dip"
|
||||
android:layout_marginTop="4dip"
|
||||
android:src="@drawable/attached_image_placeholder" />
|
||||
<TextView
|
||||
android:id="@+id/attachment_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_toRightOf="@id/attachment_icon"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorSecondaryInverse"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="middle" />
|
||||
<TextView
|
||||
android:id="@+id/attachment_info"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@id/attachment_name"
|
||||
android:layout_below="@id/attachment_name"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorTertiaryInverse"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="middle" />
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?android:attr/textColorSecondaryInverse"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="middle"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/attachment_info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorTertiaryInverse"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="middle"
|
||||
/>
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:max="100"
|
||||
android:visibility="invisible"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<Button
|
||||
android:id="@+id/load"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@id/attachment_name"
|
||||
android:layout_marginTop="6dip"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/message_view_attachment_load_action"
|
||||
android:singleLine="true" />
|
||||
android:singleLine="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@id/attachment_name"
|
||||
android:layout_marginTop="6dip"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/message_view_attachment_cancel_action"
|
||||
android:singleLine="true"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/info"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/message_view_attachment_info_action"
|
||||
android:singleLine="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/save"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_below="@id/attachment_name"
|
||||
android:layout_marginTop="6dip"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:text="@string/message_view_attachment_save_action"
|
||||
android:singleLine="true" />
|
||||
<Button
|
||||
android:id="@+id/view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@id/save"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/attachment_name"
|
||||
android:layout_marginTop="6dip"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:text="@string/message_view_attachment_view_action"
|
||||
android:singleLine="true" />
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@id/attachment_name"
|
||||
android:layout_below="@id/attachment_info"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_toLeftOf="@id/view"
|
||||
android:layout_marginRight="2dip"
|
||||
android:layout_weight="1"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:max="100"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
android:text="@string/message_view_attachment_save_action"
|
||||
android:singleLine="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/open"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/message_view_attachment_view_action"
|
||||
android:singleLine="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_vertical">
|
||||
<ImageView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:src="@drawable/ic_attachment_holo_light" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@ -15,248 +15,265 @@
|
||||
-->
|
||||
|
||||
<!-- small -->
|
||||
<LinearLayout
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#ffffffff"
|
||||
>
|
||||
<!-- header area -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
<ProgressBar
|
||||
android:id="@+id/loading_progress"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
style="?android:attr/progressBarStyleLarge"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:id="@+id/main_panel"
|
||||
android:orientation="vertical"
|
||||
android:background="@drawable/header_card"
|
||||
android:paddingTop="3dip"
|
||||
android:paddingBottom="3dip"
|
||||
android:paddingLeft="3dip"
|
||||
android:paddingRight="6dip">
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
>
|
||||
<!-- header area -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:baselineAligned="true" >
|
||||
<ImageView
|
||||
android:id="@+id/badge"
|
||||
android:layout_width="48dip"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginRight="8dip"
|
||||
android:layout_marginLeft="2dip"
|
||||
/>
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/presence"
|
||||
android:src="@android:drawable/presence_offline"
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="3dip"
|
||||
android:paddingBottom="3dip"
|
||||
android:paddingLeft="3dip"
|
||||
android:paddingRight="6dip"
|
||||
>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
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_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:paddingRight="6dip"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/from_address"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textStyle="normal"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:paddingRight="6dip"
|
||||
/>
|
||||
<!-- Reply/Forward buttons are default gone for MessageFileView -->
|
||||
<ImageView
|
||||
android:id="@+id/reply"
|
||||
android:src="@drawable/reply"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/reply_all"
|
||||
android:src="@drawable/reply_all"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/forward"
|
||||
android:src="@drawable/forward"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
android:baselineAligned="true"
|
||||
>
|
||||
<ImageView
|
||||
android:id="@+id/badge"
|
||||
android:layout_width="48dip"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginRight="8dip"
|
||||
android:layout_marginLeft="2dip"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/presence"
|
||||
android:src="@android:drawable/presence_offline"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_gravity="center_vertical"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/from_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:paddingRight="6dip"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/from_address"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textStyle="normal"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:paddingRight="6dip"
|
||||
/>
|
||||
<!-- Reply/Forward buttons are default gone for MessageFileView -->
|
||||
<ImageView
|
||||
android:id="@+id/reply"
|
||||
android:src="@drawable/reply"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/reply_all"
|
||||
android:src="@drawable/reply_all"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/forward"
|
||||
android:src="@drawable/forward"
|
||||
android:layout_width="32dip"
|
||||
android:layout_height="24dip"
|
||||
android:layout_margin="6dip"
|
||||
android:baselineAlignBottom="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/datetime"
|
||||
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>
|
||||
|
||||
<!-- To, Cc, Bcc addresses -->
|
||||
<TextView
|
||||
android:id="@+id/datetime"
|
||||
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>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/addresses"
|
||||
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
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
<TextView
|
||||
android:id="@+id/subject"
|
||||
android:id="@+id/addresses"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textStyle="bold"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1.0"
|
||||
android:layout_width="match_parent"
|
||||
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:ellipsize="end"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:src="@drawable/btn_star_off_normal_email_holo_light" />
|
||||
>
|
||||
<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="true"
|
||||
android:ellipsize="end"
|
||||
/>
|
||||
<!-- 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_off_normal_email_holo_light"
|
||||
/>
|
||||
<!-- TODO Just to prevent NPE - Phone UI is TBD -->
|
||||
<Button
|
||||
android:id="@+id/show_details"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="0dip"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/message_view_show_details"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<!-- end of header area -->
|
||||
|
||||
<!-- TODO Just to prevent NPE - Phone UI is TBD -->
|
||||
<Button
|
||||
android:id="@+id/show_details"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="0dip"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/message_view_show_details"
|
||||
android:textSize="14dip"
|
||||
android:textColor="@color/text_ternary_color"
|
||||
android:textStyle="bold"
|
||||
android:singleLine="true"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
<!-- end of header area -->
|
||||
<!-- tab area -->
|
||||
<LinearLayout
|
||||
android:id="@+id/message_tabs_section"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="6dip"
|
||||
android:paddingRight="6dip"
|
||||
android:paddingTop="6dip"
|
||||
android:paddingBottom="6dip"
|
||||
>
|
||||
<Button
|
||||
android:id="@+id/show_message"
|
||||
android:text="@string/message_view_show_message_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<!--
|
||||
Even though the "invite" section is only for MessageViewFragment, it's managed
|
||||
by MessageViewFragmentBase for simplicity.
|
||||
-->
|
||||
<Button
|
||||
android:id="@+id/show_invite"
|
||||
android:text="@string/message_view_show_invite_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_attachments"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_pictures"
|
||||
android:text="@string/message_view_show_pictures_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<!-- end of tab area -->
|
||||
<!--
|
||||
content area - only one of them is visible at a time.
|
||||
-->
|
||||
<WebView
|
||||
android:id="@+id/message_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:background="#ffffff"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<!--
|
||||
Even though the "invite" section is only for MessageViewFragment,
|
||||
Its visibility is controlled by MessageViewFragmentBase for simplicity.
|
||||
-->
|
||||
<ScrollView
|
||||
android:id="@+id/invite_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<!--
|
||||
Invite section - the views in it are controlled only by MessageViewFragment.
|
||||
MessageViewFragment shouldn't know what's inside it.
|
||||
-->
|
||||
<include layout="@layout/message_view_invitation" />
|
||||
</ScrollView>
|
||||
<ScrollView
|
||||
android:id="@+id/attachments_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<!-- tab area -->
|
||||
<LinearLayout
|
||||
android:id="@+id/attachments"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/message_tabs_section"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="4dip"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="6dip"
|
||||
android:paddingRight="6dip"
|
||||
android:paddingTop="6dip"
|
||||
android:paddingBottom="6dip"
|
||||
>
|
||||
<Button
|
||||
android:id="@+id/show_message"
|
||||
android:text="@string/message_view_show_message_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<!--
|
||||
Even though the "invite" section is only for MessageViewFragment, it's managed
|
||||
by MessageViewFragmentBase for simplicity.
|
||||
-->
|
||||
<Button
|
||||
android:id="@+id/show_invite"
|
||||
android:text="@string/message_view_show_invite_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_attachments"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<Button
|
||||
android:id="@+id/show_pictures"
|
||||
android:text="@string/message_view_show_pictures_action"
|
||||
android:layout_gravity="center"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<!-- end of tab area -->
|
||||
<!--
|
||||
content area - only one of them is visible at a time.
|
||||
-->
|
||||
<WebView
|
||||
android:id="@+id/message_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:background="#ffffff"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
</ScrollView>
|
||||
<!-- end of content area -->
|
||||
</LinearLayout>
|
||||
<!--
|
||||
Even though the "invite" section is only for MessageViewFragment,
|
||||
Its visibility is controlled by MessageViewFragmentBase for simplicity.
|
||||
-->
|
||||
<ScrollView
|
||||
android:id="@+id/invite_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<!--
|
||||
Invite section - the views in it are controlled only by MessageViewFragment.
|
||||
MessageViewFragment shouldn't know what's inside it.
|
||||
-->
|
||||
<include layout="@layout/message_view_invitation" />
|
||||
</ScrollView>
|
||||
<ScrollView
|
||||
android:id="@+id/attachments_scroll"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
>
|
||||
<LinearLayout
|
||||
android:id="@+id/attachments"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="4dip"
|
||||
android:background="#ffffff"
|
||||
/>
|
||||
</ScrollView>
|
||||
<!-- end of content area -->
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
@ -53,6 +53,8 @@ public class MessageView extends MessageViewBase implements View.OnClickListener
|
||||
|
||||
private View mMoveToNewer;
|
||||
private View mMoveToOlder;
|
||||
private View mReplyButton;
|
||||
private View mReplyAllButton;
|
||||
|
||||
// False when a message can't be forwarded/replied, such as trashed messages
|
||||
private boolean mReplyAndForwardEnabled;
|
||||
@ -89,16 +91,12 @@ public class MessageView extends MessageViewBase implements View.OnClickListener
|
||||
.findFragmentById(R.id.message_view_fragment);
|
||||
mFragment.setCallback(this);
|
||||
|
||||
// TODO Remove these bottom buttons, and make use of the ones in MessageViewFragments.
|
||||
|
||||
mMoveToNewer = findViewById(R.id.moveToNewer);
|
||||
mMoveToOlder = findViewById(R.id.moveToOlder);
|
||||
mMoveToNewer = UiUtilities.getView(this, R.id.moveToNewer);
|
||||
mMoveToOlder = UiUtilities.getView(this, R.id.moveToOlder);
|
||||
mMoveToNewer.setOnClickListener(this);
|
||||
mMoveToOlder.setOnClickListener(this);
|
||||
|
||||
findViewById(R.id.reply).setOnClickListener(this);
|
||||
findViewById(R.id.reply_all).setOnClickListener(this);
|
||||
findViewById(R.id.delete).setOnClickListener(this);
|
||||
mReplyButton = UiUtilities.getView(this, R.id.reply);
|
||||
mReplyAllButton = UiUtilities.getView(this, R.id.reply_all);
|
||||
|
||||
initFromIntent();
|
||||
if (icicle != null) {
|
||||
@ -265,8 +263,8 @@ public class MessageView extends MessageViewBase implements View.OnClickListener
|
||||
|
||||
private void enableForwardReply(boolean enabled) {
|
||||
mReplyAndForwardEnabled = enabled;
|
||||
findViewById(R.id.reply).setEnabled(enabled);
|
||||
findViewById(R.id.reply_all).setEnabled(enabled);
|
||||
mReplyButton.setEnabled(enabled);
|
||||
mReplyAllButton.setEnabled(enabled);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -17,14 +17,11 @@
|
||||
package com.android.email.activity;
|
||||
|
||||
import com.android.email.Controller;
|
||||
import com.android.email.R;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.ProgressDialog;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Browser;
|
||||
|
||||
/**
|
||||
* Base class for {@link MessageView} and {@link MessageFileView}.
|
||||
|
||||
@ -150,17 +150,17 @@ public class MessageViewFragment extends MessageViewFragmentBase
|
||||
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
final View view = super.onCreateView(inflater, container, savedInstanceState);
|
||||
|
||||
mFavoriteIcon = (ImageView) view.findViewById(R.id.favorite);
|
||||
mInviteSection = view.findViewById(R.id.invite_section);
|
||||
mReplyButton = view.findViewById(R.id.reply);
|
||||
mReplyAllButton = view.findViewById(R.id.reply_all);
|
||||
mForwardButton = view.findViewById(R.id.forward);
|
||||
mMeetingYes = (CheckBox) view.findViewById(R.id.accept);
|
||||
mMeetingMaybe = (CheckBox) view.findViewById(R.id.maybe);
|
||||
mMeetingNo = (CheckBox) view.findViewById(R.id.decline);
|
||||
mFavoriteIcon = (ImageView) UiUtilities.getView(view, R.id.favorite);
|
||||
mInviteSection = UiUtilities.getView(view, R.id.invite_section);
|
||||
mReplyButton = UiUtilities.getView(view, R.id.reply);
|
||||
mReplyAllButton = UiUtilities.getView(view, R.id.reply_all);
|
||||
mForwardButton = UiUtilities.getView(view, R.id.forward);
|
||||
mMeetingYes = (CheckBox) UiUtilities.getView(view, R.id.accept);
|
||||
mMeetingMaybe = (CheckBox) UiUtilities.getView(view, R.id.maybe);
|
||||
mMeetingNo = (CheckBox) UiUtilities.getView(view, R.id.decline);
|
||||
|
||||
// Star is only visible on this fragment (as opposed to MessageFileViewFragment.)
|
||||
view.findViewById(R.id.favorite).setVisibility(View.VISIBLE);
|
||||
UiUtilities.getView(view, R.id.favorite).setVisibility(View.VISIBLE);
|
||||
|
||||
mFavoriteIcon.setOnClickListener(this);
|
||||
mReplyButton.setOnClickListener(this);
|
||||
@ -169,7 +169,7 @@ public class MessageViewFragment extends MessageViewFragmentBase
|
||||
mMeetingYes.setOnCheckedChangeListener(this);
|
||||
mMeetingMaybe.setOnCheckedChangeListener(this);
|
||||
mMeetingNo.setOnCheckedChangeListener(this);
|
||||
view.findViewById(R.id.invite_link).setOnClickListener(this);
|
||||
UiUtilities.getView(view, R.id.invite_link).setOnClickListener(this);
|
||||
|
||||
enableReplyForwardButtons(false);
|
||||
|
||||
|
||||
@ -281,30 +281,30 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||
}
|
||||
final View view = inflater.inflate(R.layout.message_view_fragment, container, false);
|
||||
|
||||
mSubjectView = (TextView) view.findViewById(R.id.subject);
|
||||
mFromNameView = (TextView) view.findViewById(R.id.from_name);
|
||||
mFromAddressView = (TextView) view.findViewById(R.id.from_address);
|
||||
mAddressesView = (TextView) view.findViewById(R.id.addresses);
|
||||
mDateTimeView = (TextView) view.findViewById(R.id.datetime);
|
||||
mMessageContentView = (WebView) view.findViewById(R.id.message_content);
|
||||
mAttachments = (LinearLayout) view.findViewById(R.id.attachments);
|
||||
mTabSection = view.findViewById(R.id.message_tabs_section);
|
||||
mFromBadge = (ImageView) view.findViewById(R.id.badge);
|
||||
mSenderPresenceView = (ImageView) view.findViewById(R.id.presence);
|
||||
mMainView = view.findViewById(R.id.main_panel);
|
||||
mLoadingProgress = view.findViewById(R.id.loading_progress);
|
||||
mShowDetailsButton = (Button) view.findViewById(R.id.show_details);
|
||||
mSubjectView = (TextView) UiUtilities.getView(view, R.id.subject);
|
||||
mFromNameView = (TextView) UiUtilities.getView(view, R.id.from_name);
|
||||
mFromAddressView = (TextView) UiUtilities.getView(view, R.id.from_address);
|
||||
mAddressesView = (TextView) UiUtilities.getView(view, R.id.addresses);
|
||||
mDateTimeView = (TextView) UiUtilities.getView(view, R.id.datetime);
|
||||
mMessageContentView = (WebView) UiUtilities.getView(view, R.id.message_content);
|
||||
mAttachments = (LinearLayout) UiUtilities.getView(view, R.id.attachments);
|
||||
mTabSection = UiUtilities.getView(view, R.id.message_tabs_section);
|
||||
mFromBadge = (ImageView) UiUtilities.getView(view, R.id.badge);
|
||||
mSenderPresenceView = (ImageView) UiUtilities.getView(view, R.id.presence);
|
||||
mMainView = UiUtilities.getView(view, R.id.main_panel);
|
||||
mLoadingProgress = UiUtilities.getView(view, R.id.loading_progress);
|
||||
mShowDetailsButton = (Button) UiUtilities.getView(view, R.id.show_details);
|
||||
|
||||
mFromNameView.setOnClickListener(this);
|
||||
mFromAddressView.setOnClickListener(this);
|
||||
mFromBadge.setOnClickListener(this);
|
||||
mSenderPresenceView.setOnClickListener(this);
|
||||
|
||||
mMessageTab = (TextView) view.findViewById(R.id.show_message);
|
||||
mAttachmentTab = (TextView) view.findViewById(R.id.show_attachments);
|
||||
mShowPicturesTab = (TextView) view.findViewById(R.id.show_pictures);
|
||||
mMessageTab = (TextView) UiUtilities.getView(view, R.id.show_message);
|
||||
mAttachmentTab = (TextView) UiUtilities.getView(view, R.id.show_attachments);
|
||||
mShowPicturesTab = (TextView) UiUtilities.getView(view, R.id.show_pictures);
|
||||
// Invite is only used in MessageViewFragment, but visibility is controlled here.
|
||||
mInviteTab = (TextView) view.findViewById(R.id.show_invite);
|
||||
mInviteTab = (TextView) UiUtilities.getView(view, R.id.show_invite);
|
||||
|
||||
mMessageTab.setOnClickListener(this);
|
||||
mAttachmentTab.setOnClickListener(this);
|
||||
@ -312,8 +312,8 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||
mInviteTab.setOnClickListener(this);
|
||||
mShowDetailsButton.setOnClickListener(this);
|
||||
|
||||
mAttachmentsScroll = view.findViewById(R.id.attachments_scroll);
|
||||
mInviteScroll = view.findViewById(R.id.invite_scroll);
|
||||
mAttachmentsScroll = UiUtilities.getView(view, R.id.attachments_scroll);
|
||||
mInviteScroll = UiUtilities.getView(view, R.id.invite_scroll);
|
||||
|
||||
WebSettings webSettings = mMessageContentView.getSettings();
|
||||
boolean supportMultiTouch = mContext.getPackageManager()
|
||||
@ -475,13 +475,8 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||
* to avoid flicker.
|
||||
*/
|
||||
private void showContent(boolean showContent, boolean showProgressWhenHidden) {
|
||||
if (mLoadingProgress == null) {
|
||||
// Phone UI doesn't have it yet.
|
||||
// TODO Add loading_progress and main_panel to the phone layout too.
|
||||
} else {
|
||||
makeVisible(mMainView, showContent);
|
||||
makeVisible(mLoadingProgress, !showContent && showProgressWhenHidden);
|
||||
}
|
||||
makeVisible(mMainView, showContent);
|
||||
makeVisible(mLoadingProgress, !showContent && showProgressWhenHidden);
|
||||
}
|
||||
|
||||
protected void resetView() {
|
||||
@ -1332,15 +1327,15 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||
LayoutInflater inflater = getActivity().getLayoutInflater();
|
||||
View view = inflater.inflate(R.layout.message_view_attachment, null);
|
||||
|
||||
TextView attachmentName = (TextView)view.findViewById(R.id.attachment_name);
|
||||
TextView attachmentInfoView = (TextView)view.findViewById(R.id.attachment_info);
|
||||
ImageView attachmentIcon = (ImageView)view.findViewById(R.id.attachment_icon);
|
||||
Button openButton = (Button)view.findViewById(R.id.open);
|
||||
Button saveButton = (Button)view.findViewById(R.id.save);
|
||||
Button loadButton = (Button)view.findViewById(R.id.load);
|
||||
Button infoButton = (Button)view.findViewById(R.id.info);
|
||||
Button cancelButton = (Button)view.findViewById(R.id.cancel);
|
||||
ProgressBar attachmentProgress = (ProgressBar)view.findViewById(R.id.progress);
|
||||
TextView attachmentName = (TextView) UiUtilities.getView(view, R.id.attachment_name);
|
||||
TextView attachmentInfoView = (TextView) UiUtilities.getView(view, R.id.attachment_info);
|
||||
ImageView attachmentIcon = (ImageView) UiUtilities.getView(view, R.id.attachment_icon);
|
||||
Button openButton = (Button) UiUtilities.getView(view, R.id.open);
|
||||
Button saveButton = (Button) UiUtilities.getView(view, R.id.save);
|
||||
Button loadButton = (Button) UiUtilities.getView(view, R.id.load);
|
||||
Button infoButton = (Button) UiUtilities.getView(view, R.id.info);
|
||||
Button cancelButton = (Button) UiUtilities.getView(view, R.id.cancel);
|
||||
ProgressBar attachmentProgress = (ProgressBar) UiUtilities.getView(view, R.id.progress);
|
||||
|
||||
MessageViewAttachmentInfo attachmentInfo = new MessageViewAttachmentInfo(
|
||||
mContext, attachment, attachmentProgress);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user