diff options
41 files changed, 21 insertions, 2651 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index f9a9ad346..f9b723970 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -60,6 +60,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_inte $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/email2/Android.mk b/email2/Android.mk index ec39ac4f8..d47aa4c49 100644 --- a/email2/Android.mk +++ b/email2/Android.mk @@ -23,7 +23,7 @@ include $(CLEAR_VARS) chips_dir := ../../../../frameworks/ex/chips/res mail_common_dir := ../../../../frameworks/opt/mailcommon/res unified_email_dir := ../../UnifiedEmail -res_dir := $(chips_dir) $(mail_common_dir) $(unified_email_dir)/email_src/res $(unified_email_dir)/res res +res_dir := $(chips_dir) $(mail_common_dir) $(unified_email_dir)/email_src/res res $(unified_email_dir)/res LOCAL_MODULE_TAGS := optional diff --git a/email2/res/layout-sw600dp/compose_area_buttons.xml b/email2/res/layout-sw600dp/compose_area_buttons.xml deleted file mode 100644 index 9c7ff2761..000000000 --- a/email2/res/layout-sw600dp/compose_area_buttons.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<!-- For add attachments and +cc/bcc --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="match_parent" - android:layout_width="wrap_content" - style="@style/ComposeButtonColumn"> - - <LinearLayout android:id="@+id/compose_buttons_spacer" - android:layout_height="0dip" - android:layout_width="match_parent" - android:layout_weight="1" /> - - <Button android:id="@+id/add_cc_bcc" - android:text="@string/plus_cc_label" - style="@style/ComposeButton" - android:layout_marginLeft="16dip" /> - - <ImageView android:id="@+id/add_attachment" - android:text="@string/add_file_attachment" - android:layout_width="32dip" - android:layout_height="32dip" - android:src="@drawable/ic_attachment_holo_light" - android:clickable="true" - android:layout_gravity="center_vertical|left" - android:gravity="left" - android:layout_marginLeft="14dip" /> - -</LinearLayout>
\ No newline at end of file diff --git a/email2/res/layout-sw600dp/message_compose.xml b/email2/res/layout-sw600dp/message_compose.xml deleted file mode 100644 index 0a6dc6781..000000000 --- a/email2/res/layout-sw600dp/message_compose.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:fillViewport="true"> - - <LinearLayout - android:id="@+id/compose_scrollview" - android:orientation="vertical" - android:layout_width="@dimen/compose_scrollview_width" - android:layout_height="match_parent" - android:paddingTop="8dip" - android:background="@android:color/white" - android:layout_gravity="center_horizontal"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingLeft="100dip"> - - <LinearLayout android:id="@+id/content" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <!-- For the to, cc, bcc, and subject --> - <LinearLayout android:id="@+id/wrapper" - android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_weight="1" - android:layout_height="wrap_content"> - - <include layout="@layout/compose_from"/> - - <include layout="@layout/compose_area_recipients"/> - - </LinearLayout> - - <include layout="@layout/compose_area_buttons"/> - - </LinearLayout> - - <!-- Attachments --> - <LinearLayout android:id="@+id/attachment_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:orientation="vertical" - android:visibility="gone" - android:layout_marginRight="100dip" - > - <!-- - Empty container for storing attachments. We'll stick - instances of message_compose_attachment.xml in here. - --> - <LinearLayout android:id="@+id/attachments" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - /> - </LinearLayout> - - <!-- Compose Area --> - <FrameLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginRight="100dip"> - - <include layout="@layout/compose_body"/> - - </FrameLayout> - - <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginRight="100dip"> - <include layout="@layout/quoted_text"/> - </RelativeLayout> - <FrameLayout - android:id="@+id/composearea_tap_trap_bottom" - android:layout_weight="1" - android:layout_height="0dip" - android:layout_width="match_parent" - android:clickable="true"/> - - </LinearLayout> - </LinearLayout> -</ScrollView>
\ No newline at end of file diff --git a/email2/res/layout-sw600dp/message_view_attachment.xml b/email2/res/layout-sw600dp/message_view_attachment.xml deleted file mode 100644 index 77062169e..000000000 --- a/email2/res/layout-sw600dp/message_view_attachment.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- tablet --> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="64dip" - android:orientation="horizontal" - android:background="@drawable/attachment_bg_holo" - > - <FrameLayout - android:layout_width="64dip" - android:layout_height="64dip" - android:orientation="vertical" - android:background="#e5e5e5" - > - <ImageView - android:id="@+id/attachment_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:src="@drawable/ic_attachment_holo_light" - android:scaleType="center" - /> - <ProgressBar - android:id="@+id/progress" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dip" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:visibility="invisible" - /> - </FrameLayout> - <LinearLayout - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="horizontal" - android:divider="?android:attr/dividerVertical" - android:showDividers="middle" - android:dividerPadding="16dip" - > - <RelativeLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:layout_marginLeft="32dip" - android:layout_marginRight="16dip" - > - <TextView - android:id="@+id/attachment_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="18dip" - android:textColor="#333333" - android:singleLine="true" - android:ellipsize="middle" - /> - <TextView - android:id="@+id/attachment_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/attachment_name" - android:textSize="14sp" - android:textColor="@color/text_secondary_color" - android:singleLine="true" - /> - </RelativeLayout> - - <!-- Buttons --> - <LinearLayout - android:layout_width="224dip" - android:layout_height="match_parent" - android:layout_weight="0" - android:orientation="horizontal" - android:divider="?android:attr/dividerVertical" - android:showDividers="middle" - > - <Button - android:id="@+id/load" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_load_action" - android:visibility="gone" - /> - <Button - android:id="@+id/cancel" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_cancel_action" - android:visibility="gone" - /> - <Button - android:id="@+id/info" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_info_action" - android:visibility="gone" - /> - <Button - android:id="@+id/open" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_view_action" - android:visibility="gone" - /> - <Button - android:id="@+id/save" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_save_action" - android:visibility="gone" - /> - </LinearLayout> - </LinearLayout> -</LinearLayout> diff --git a/email2/res/layout-sw600dp/message_view_fragment.xml b/email2/res/layout-sw600dp/message_view_fragment.xml deleted file mode 100644 index e0bc2c9d4..000000000 --- a/email2/res/layout-sw600dp/message_view_fragment.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- tablet --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - > - <ProgressBar - android:id="@+id/loading_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - style="?android:attr/progressBarStyleLarge" - /> - <com.android.email.view.NonLockingScrollView - android:id="@+id/main_panel" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" - android:orientation="vertical" - > - - <!-- Subject --> - <TextView - android:id="@+id/subject" - android:layout_width="match_parent" - android:layout_height="48dip" - android:gravity="center_vertical" - style="@style/message_view_subject" - /> - - <View - android:id="@+id/subject_divider" - android:layout_marginBottom="16dip" - android:layout_width="match_parent" - style="@style/message_view_horizontal_divider" - /> - - <!-- Upper header. Outer container needed only since the relative layout - params can't be passed in an include tag.--> - <FrameLayout - android:id="@+id/message_view_header_upper" - android:layout_width="match_parent" - android:layout_height="wrap_content" - > - <include layout="@layout/message_view_header_upper" /> - </FrameLayout> - - <!-- Addresses, timestamp --> - <FrameLayout - android:id="@+id/message_view_subheader" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - > - <include layout="@layout/message_view_subheader" /> - </FrameLayout> - - <View - android:id="@+id/address_divider" - android:layout_width="match_parent" - style="@style/message_view_horizontal_divider" - /> - - <!-- The rest: tab + body + command buttons. --> - <!-- Tabs + divider --> - <LinearLayout - android:id="@+id/message_tabs_section" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - > - <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: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: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: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:gravity="center" - style="?android:attr/borderlessButtonStyle" - 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" - /> - <Button - android:id="@+id/always_show_pictures_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="center" - style="?android:attr/borderlessButtonStyle" - android:padding="0dip" - android:text="@string/message_view_always_show_pictures_prompt" - android:textSize="14dip" - android:textColor="@color/text_ternary_color" - android:drawableRight="@drawable/ic_show_images_holo_light" - android:drawablePadding="8dip" - android:visibility="gone" - /> - <View - android:layout_width="16dip" - android:layout_height="0dip" - /> - </LinearLayout> - <View - android:layout_width="match_parent" - style="@style/message_view_horizontal_divider" - /> - </LinearLayout> - - <!-- margin --> - <View - android:layout_width="0dip" - android:layout_height="16dip" - /> - - <!-- content area - only one of them is visible at a time --> - <!-- Message body --> - <com.android.email.view.RigidWebView - android:id="@+id/message_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@android:color/white" - android:visibility="gone" - /> - - <!-- TODO: get rid of these useless _scroll elements now that - they're no longer needed --> - <!-- Invite: Even though this section is only for MessageViewFragment, - Its visibility is controlled by MessageViewFragmentBase for simplicity. - MessageFileViewFragment shouldn't touch this. --> - <FrameLayout - android:id="@+id/invite_scroll" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" - > - <include layout="@layout/message_view_invitation" /> - </FrameLayout> - - <!-- Attachments --> - <FrameLayout - android:id="@+id/attachments_scroll" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" - > - <LinearLayout - android:id="@+id/attachments" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:divider="?android:attr/dividerHorizontal" - android:showDividers="beginning|middle|end" - /> - </FrameLayout> - </LinearLayout> - </com.android.email.view.NonLockingScrollView> -</FrameLayout> diff --git a/email2/res/layout-sw600dp/message_view_header_actions.xml b/email2/res/layout-sw600dp/message_view_header_actions.xml deleted file mode 100644 index 983eac248..000000000 --- a/email2/res/layout-sw600dp/message_view_header_actions.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ImageButton - android:id="@+id/reply" - style="@style/message_view_action_buttons" - android:src="@drawable/ic_reply_holo_dark" - android:contentDescription="@string/reply_action" - android:baselineAlignBottom="true" - /> - <ImageButton - android:id="@+id/reply_all" - style="@style/message_view_action_buttons" - android:src="@drawable/ic_reply_all_holo_dark" - android:contentDescription="@string/reply_all_action" - android:baselineAlignBottom="true" - /> - <ImageButton - android:id="@+id/forward" - style="@style/message_view_action_buttons" - android:src="@drawable/ic_forward_holo_dark" - android:contentDescription="@string/forward_action" - android:baselineAlignBottom="true" - /> - <ImageButton - android:id="@+id/favorite" - style="@style/message_view_action_buttons" - android:src="@drawable/btn_star_off_convo_holo_light" - android:contentDescription="@string/favorite_action" - android:baselineAlignBottom="true" - /> -</merge> - diff --git a/email2/res/layout/action_bar_custom_view.xml b/email2/res/layout/action_bar_custom_view.xml deleted file mode 100644 index 423b546bd..000000000 --- a/email2/res/layout/action_bar_custom_view.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- - Custom view set to the action bar. - - layout_width/height are set at runtime using ActionBar.setCustomView() ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/action_bar_custom_view" - > - <include - android:id="@+id/account_spinner_container" - layout="@layout/action_bar_spinner" - android:visibility="gone" - /> -</FrameLayout> diff --git a/email2/res/layout/action_bar_indeterminate_progress.xml b/email2/res/layout/action_bar_indeterminate_progress.xml deleted file mode 100644 index 87c7ecf1d..000000000 --- a/email2/res/layout/action_bar_indeterminate_progress.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="64dip" - android:layout_height="wrap_content" - android:gravity="center" - > - <!-- 32dip = size of the refresh button --> - <ProgressBar - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_gravity="center" - style="?android:attr/indeterminateProgressStyle" - /> -</FrameLayout> diff --git a/email2/res/layout/action_bar_search.xml b/email2/res/layout/action_bar_search.xml deleted file mode 100644 index e2cd96032..000000000 --- a/email2/res/layout/action_bar_search.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<SearchView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:iconifiedByDefault="true" - /> diff --git a/email2/res/layout/action_bar_spinner.xml b/email2/res/layout/action_bar_spinner.xml deleted file mode 100644 index a3b1cf260..000000000 --- a/email2/res/layout/action_bar_spinner.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/AccountSwitchSpinnerItem" - android:layout_height="match_parent" - android:paddingLeft="0dip" - android:layout_marginLeft="0dip"> - - <TextView - android:id="@+id/spinner_count" - android:layout_alignParentRight="true" - android:layout_marginLeft="4dp" - style="@style/unreadCountActionBar" /> - - <!-- This spacer is here just to soak up horizontal space. --> - <!-- If this is omitted, the spinner triangle is too far from the text. --> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@id/spinner_count"> - - <LinearLayout - android:id="@+id/account_spinner" - style="?android:attr/actionDropDownStyle" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="center_vertical"> - <TextView - android:id="@+id/spinner_line_1" - style="@style/AccountSpinnerAnchorTextPrimary" - android:singleLine="true" - android:ellipsize="end" - android:includeFontPadding="false" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - <TextView - android:id="@+id/spinner_line_2" - style="@style/AccountSpinnerAnchorTextSecondary" - android:singleLine="true" - android:ellipsize="end" - android:includeFontPadding="false" - android:layout_marginRight="4dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </LinearLayout> - - </FrameLayout> - -</RelativeLayout>
\ No newline at end of file diff --git a/email2/res/layout/action_bar_spinner_dropdown.xml b/email2/res/layout/action_bar_spinner_dropdown.xml deleted file mode 100644 index 41fd00c21..000000000 --- a/email2/res/layout/action_bar_spinner_dropdown.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- - The list items for the account spinner drop down. - Popup width is set at runtime from @dimen/account_dropdown_dropdownwidth ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="?android:attr/spinnerDropDownItemStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="48dip" - android:gravity="center_vertical"> - - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1"> - <TextView - android:id="@+id/display_name" - android:singleLine="true" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:ellipsize="end" - style="@style/AccountSpinnerDropdownTextPrimary" /> - - <TextView - android:id="@+id/email_address" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:ellipsize="end" - android:layout_below="@id/display_name" - android:layout_alignWithParentIfMissing="true" - android:layout_centerVertical="true" - style="@style/AccountSpinnerDropdownTextSecondary" /> - - </RelativeLayout> - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="wrap_content"> - <View - android:id="@+id/color_chip" - android:layout_width="32dip" - android:layout_height="6dip" - android:layout_marginBottom="2dip" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dip" - android:background="@android:color/black" - /> - <TextView - android:id="@+id/unread_count" - style="@style/unreadCount" - android:layout_centerVertical="true" /> - </RelativeLayout> - -</LinearLayout> - diff --git a/email2/res/layout/action_bar_spinner_dropdown_header.xml b/email2/res/layout/action_bar_spinner_dropdown_header.xml deleted file mode 100644 index 93b0b2fae..000000000 --- a/email2/res/layout/action_bar_spinner_dropdown_header.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/display_name" - android:ellipsize="end" - android:textColor="@color/label_list_heading_text_color" - style="?android:attr/listSeparatorTextViewStyle" /> diff --git a/email2/res/layout/compose_area_recipients.xml b/email2/res/layout/compose_area_recipients.xml deleted file mode 100644 index bac5e3864..000000000 --- a/email2/res/layout/compose_area_recipients.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<!-- We must have unique ID's for the address fields in order to have the text -automatically saved by framework.--> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/compose_recipients_wrapper" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <!-- To --> - - <LinearLayout android:id="@+id/to_content" - style="@style/RecipientComposeFieldLayout"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:addStatesFromChildren="true" - android:gravity="center_vertical" - android:layout_gravity="center_vertical"> - - <TextView style="@style/RecipientComposeHeading" - android:text="@string/to" - android:id="@+id/to_label" - android:contentDescription="@string/to"/> - - <com.android.email.activity.AddressTextView - android:id="@+id/to" - style="@style/RecipientEditTextViewStyle"/> - - </LinearLayout> - - <View style="@style/RecipientComposeFieldSpacer"/> - </LinearLayout> - - - <RelativeLayout android:layout_height="wrap_content" - android:layout_width="match_parent" - android:id="@+id/cc_bcc_wrapper" - android:layout_below="@id/to_content" - android:visibility="gone"> - - <LinearLayout style="@style/RecipientComposeFieldLayout" - android:id="@+id/cc_content" - android:layout_alignParentTop="true"> - - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:addStatesFromChildren="true" - android:gravity="center_vertical"> - - <TextView - style="@style/RecipientComposeHeading" - android:text="@string/cc" - android:id="@+id/cc_label" - android:contentDescription="@string/cc"/> - - <com.android.email.activity.AddressTextView - android:id="@+id/cc" - style="@style/RecipientEditTextViewStyle"/> - </LinearLayout> - - <View style="@style/RecipientComposeFieldSpacer"/> - </LinearLayout> - - <LinearLayout style="@style/RecipientComposeFieldLayout" - android:id="@+id/bcc_content" - android:layout_below="@id/cc_content"> - - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:addStatesFromChildren="true" - android:gravity="center_vertical"> - - <TextView style="@style/RecipientComposeHeading" - android:text="@string/bcc" - android:id="@+id/bcc_label" - android:contentDescription="@string/bcc"/> - - <com.android.email.activity.AddressTextView - android:id="@+id/bcc" - style="@style/RecipientEditTextViewStyle"/> - - </LinearLayout> - - <View style="@style/RecipientComposeFieldSpacer"/> - </LinearLayout> - - </RelativeLayout> - - <RelativeLayout style="@style/ComposeFieldLayout" - android:layout_below="@id/cc_bcc_wrapper"> - <!-- Subject: localization cannot control what field pressing tab will bring the user to. This is controlled at runtime. --> - <EditText android:id="@+id/subject" - android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine|textMultiLine" - android:hint="@string/subject_hint" - android:textColorHint="@color/compose_label_text" - android:imeOptions="actionDone|flagNoExtractUi" - style="@style/ComposeEditTextView" /> - </RelativeLayout> -</RelativeLayout>
\ No newline at end of file diff --git a/email2/res/layout/compose_body.xml b/email2/res/layout/compose_body.xml deleted file mode 100644 index 119cac74d..000000000 --- a/email2/res/layout/compose_body.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/ComposeFieldLayout"> - - <EditText android:id="@+id/body_text" - style="@style/ComposeBodyStyle" - android:hint="@string/body_hint"/> - -</RelativeLayout>
\ No newline at end of file diff --git a/email2/res/layout/compose_from.xml b/email2/res/layout/compose_from.xml deleted file mode 100644 index 6c02ec3bc..000000000 --- a/email2/res/layout/compose_from.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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" - style="@style/ComposeFieldLayout" - android:layout_height="48dip" - android:layout_marginTop="4dip"> - - <TextView android:id="@+id/from" - android:layout_width="match_parent" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceMedium" - android:background="@android:color/transparent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:gravity="center_vertical" /> - -</LinearLayout> diff --git a/email2/res/layout/mailbox_list_fragment.xml b/email2/res/layout/mailbox_list_fragment.xml deleted file mode 100644 index fd9219db7..000000000 --- a/email2/res/layout/mailbox_list_fragment.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- Wrap list_content in a frame layout to apply the top margin. --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <include layout="@android:layout/list_content" /> -</FrameLayout>
\ No newline at end of file diff --git a/email2/res/layout/mailbox_list_header.xml b/email2/res/layout/mailbox_list_header.xml deleted file mode 100644 index b6bba17be..000000000 --- a/email2/res/layout/mailbox_list_header.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/display_name" - android:layout_width="match_parent" - android:ellipsize="end" - android:textColor="@color/label_list_heading_text_color" - style="?android:attr/listSeparatorTextViewStyle" - android:layout_marginLeft="@dimen/mailbox_list_padding_left" /> diff --git a/email2/res/layout/mailbox_list_item.xml b/email2/res/layout/mailbox_list_item.xml deleted file mode 100644 index d1c45b6a4..000000000 --- a/email2/res/layout/mailbox_list_item.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<!-- extends RelativeLayout --> -<!-- - NOTE: Don't set padding for this. - Background of this view will be changed by code for D&D, which resets padding. ---> -<com.android.email.activity.MailboxListItem - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="48dip" - android:background="?android:attr/activatedBackgroundIndicator" - > - <TextView - android:id="@+id/message_count" - android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/mailbox_list_padding_right" - style="@style/unreadCount" - /> - <RelativeLayout - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/mailbox_list_padding_left" - android:layout_toLeftOf="@id/message_count" - > - <ImageView - android:id="@+id/folder_icon" - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_centerVertical="true" - android:layout_marginRight="8dip" - /> - <TextView - android:id="@+id/mailbox_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/folder_icon" - android:layout_centerVertical="true" - android:ellipsize="end" - android:singleLine="true" - android:textSize="18dip" - android:textColor="@color/text_color_primary_invertible" - /> - </RelativeLayout> - <!-- Color chips are shown only for account rows on combined view. --> - <View - android:id="@+id/color_chip" - android:layout_width="32dip" - android:layout_height="8dip" - android:layout_marginLeft="@dimen/mailbox_list_padding_left" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:visibility="gone" - /> - <ImageView - android:id="@+id/folder_expanded_icon" - android:layout_width="16dip" - android:layout_height="16dip" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:visibility="gone" - /> -</com.android.email.activity.MailboxListItem> diff --git a/email2/res/layout/message_compose.xml b/email2/res/layout/message_compose.xml deleted file mode 100644 index e2c035e7c..000000000 --- a/email2/res/layout/message_compose.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?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. ---> - -<!-- small --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" android:layout_width="match_parent" - android:orientation="vertical"> - <ScrollView android:layout_width="match_parent" - android:layout_height="0dip" android:layout_weight="1" - android:fillViewport="true" - android:paddingLeft="16dip" - android:paddingRight="16dip"> - <LinearLayout android:orientation="vertical" - android:layout_width="match_parent" android:layout_height="wrap_content"> - <LinearLayout android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <!-- Not actually editable --> - <include layout="@layout/compose_from"/> - - <include layout="@layout/compose_area_recipients"/> - - <!-- - Empty container for storing attachments. We'll stick - instances of message_compose_attachment.xml in here. - --> - <LinearLayout android:id="@+id/attachments" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - <!-- Dummy view to keep it compatible with the xlarge counterpart --> - <View - android:id="@+id/attachment_container" - android:layout_width="0dip" - android:layout_height="0dip" - android:visibility="gone" - /> - </LinearLayout> - <include layout="@layout/compose_body"/> - <!-- quoted text bar --> - <include layout="@layout/quoted_text"/> - </LinearLayout> - </ScrollView> -</LinearLayout> diff --git a/email2/res/layout/message_file_view.xml b/email2/res/layout/message_file_view.xml deleted file mode 100644 index 790f09a97..000000000 --- a/email2/res/layout/message_file_view.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - > - <fragment - android:id="@+id/message_file_view_fragment" - class="com.android.email.activity.MessageFileViewFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> -</FrameLayout> diff --git a/email2/res/layout/message_list_fragment.xml b/email2/res/layout/message_list_fragment.xml deleted file mode 100644 index 97363abc9..000000000 --- a/email2/res/layout/message_list_fragment.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- - The default ListFragment layout (include) + the "send outgoing message" button. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - - <!-- Search header is dynamically inserted here for search results --> - - <include - layout="@android:layout/list_content" - android:id="@+id/list_panel" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> - - <!-- Message list error overlays are dynamically inserted here --> - -</LinearLayout> diff --git a/email2/res/layout/message_list_item_footer.xml b/email2/res/layout/message_list_item_footer.xml deleted file mode 100644 index a4ecb8d11..000000000 --- a/email2/res/layout/message_list_item_footer.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:gravity="center" - android:orientation="horizontal"> - <ProgressBar - android:id="@+id/progress" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - style="?android:attr/progressBarStyleSmall" - android:paddingRight="10dip" - android:visibility="gone" - /> - <TextView - android:id="@+id/main_text" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorPrimary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - /> -</LinearLayout> diff --git a/email2/res/layout/message_list_item_normal.xml b/email2/res/layout/message_list_item_normal.xml deleted file mode 100644 index 188c080f6..000000000 --- a/email2/res/layout/message_list_item_normal.xml +++ /dev/null @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- This layout is used as a template to create a custom message item view - in normal mode. To be able to get the correct measurements, every source field should - be populated with data here. E.g: - - Text View should set text to a random long string (android:text="@string/long_string") - - Image View should set source to a specific asset --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/message_list_item_normal" - android:layout_width="match_parent" - android:layout_height="@dimen/message_list_item_height_normal" - android:orientation="horizontal"> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingLeft="8dip" - android:paddingRight="8dip" - > - <ImageView - android:id="@+id/reply_state" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - 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 - - individual children should set their own top margins --> - <RelativeLayout - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="vertical" - android:paddingRight="16dip" - > - <View - android:id="@+id/color_chip" - android:layout_width="@dimen/message_list_item_color_tip_width" - android:layout_height="@dimen/message_list_item_color_tip_height" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - /> - <ImageView - android:id="@+id/star" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginTop="@dimen/star_margin_top" - android:src="@drawable/btn_star_off_normal_email_holo_light" /> - - <LinearLayout - android:id="@+id/date_container" - android:layout_width="80dip" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginTop="@dimen/date_margin_top" - android:orientation="horizontal" - > - <!-- reserve enough vertical space for two icons --> - <ImageView - android:id="@+id/paperclip" - android:layout_width="36dip" - android:layout_height="16dip" - android:layout_gravity="top" - android:src="@drawable/ic_badge_attachment" /> - <TextView - android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/date_font_size" - android:text="@string/long_string" - android:lines="1" /> - </LinearLayout> - - <TextView - android:id="@+id/senders" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/date_container" - android:layout_marginTop="8dip" - android:text="@string/long_string" - android:textSize="@dimen/senders_font_size" - android:lines="1" /> - <TextView - android:id="@+id/subject" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_toLeftOf="@+id/star" - android:layout_marginBottom="8dip" - android:text="@string/long_string" - android:textSize="@dimen/subject_font_size" - android:lines="2" /> - </RelativeLayout> -</LinearLayout> diff --git a/email2/res/layout/message_list_item_wide.xml b/email2/res/layout/message_list_item_wide.xml deleted file mode 100644 index 01c06d7ee..000000000 --- a/email2/res/layout/message_list_item_wide.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - - -<!-- This layout is used as a template to create custom message list item view - in wide mode. To be able to get the correct measurements, every source field should - be populated with data here. E.g: - - Text View should set text to a random long string (android:text="@string/long_string") - - Image View should set source to a specific asset --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/message_list_item_wide" - android:layout_width="match_parent" - android:layout_height="match_parent" - 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="0dip" - android:layout_height="wrap_content" - android:layout_weight="0.3" - android:layout_gravity="center_vertical" - android:text="@string/long_string" - android:textSize="@dimen/wide_senders_font_size" - android:lines="1" /> - <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_height="wrap_content" - android:layout_weight="0.7" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:layout_gravity="center_vertical" - android:text="@string/long_string" - android:textSize="@dimen/wide_subject_font_size" - android:lines="2" /> - <RelativeLayout - android:layout_width="144dip" - android:layout_height="match_parent"> - <View - android:id="@+id/color_chip" - android:layout_width="@dimen/message_list_item_color_tip_width" - android:layout_height="@dimen/message_list_item_color_tip_height" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:paddingTop="2dip" /> - - <ImageView - android:id="@+id/paperclip" - android:layout_width="36dip" - android:layout_height="16dip" - android:layout_centerVertical="true" - android:layout_marginRight="4dip" - android:src="@drawable/ic_attachment_holo_light" /> - - <TextView - android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:text="@string/long_string" - android:lines="1" /> - - </RelativeLayout> - <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> diff --git a/email2/res/layout/message_list_search_header.xml b/email2/res/layout/message_list_search_header.xml deleted file mode 100644 index e1b398a47..000000000 --- a/email2/res/layout/message_list_search_header.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_header" - style="@style/search_header" - android:gravity="center_vertical" - android:background="#666" - android:visibility="gone" - > - <TextView - android:id="@+id/search_count" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:textColor="@android:color/white" - /> - <TextView - android:id="@+id/search_header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textColor="@android:color/white" - /> -</RelativeLayout> diff --git a/email2/res/layout/message_list_warning.xml b/email2/res/layout/message_list_warning.xml deleted file mode 100644 index 80b865d7b..000000000 --- a/email2/res/layout/message_list_warning.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- - The default ListFragment layout (include) + the "send outgoing message" button. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:orientation="vertical" - android:gravity="center" - > - - <ProgressBar style="?android:attr/progressBarStyleLarge" - android:id="@+id/spinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - <TextView - android:id="@+id/message_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:layout_marginTop="4dip" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - - <TextView - android:id="@+id/message_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="32dip" - android:layout_marginRight="32dip" - android:layout_marginTop="4dip" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - -</LinearLayout> diff --git a/email2/res/layout/message_view_attachment.xml b/email2/res/layout/message_view_attachment.xml deleted file mode 100644 index eeb159252..000000000 --- a/email2/res/layout/message_view_attachment.xml +++ /dev/null @@ -1,122 +0,0 @@ -<?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. ---> - -<!-- phone --> -<!-- - TODO Remove the default visibility and always set them from code. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:divider="?android:attr/dividerHorizontal" - android:showDividers="middle" - android:background="@drawable/attachment_bg_holo" - > - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - > - <FrameLayout - android:id="@+id/attachment_container" - android:layout_width="48dip" - android:layout_height="48dip" - android:background="#e5e5e5" - > - <ImageView - android:id="@+id/attachment_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:src="@drawable/ic_attachment_holo_light" - android:scaleType="center" - /> - <ProgressBar - android:id="@+id/progress" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dip" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:visibility="invisible" - /> - </FrameLayout> - <TextView - android:id="@+id/attachment_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/attachment_container" - android:layout_marginLeft="16dip" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#333333" - android:singleLine="true" - android:ellipsize="middle" - /> - <TextView - android:id="@+id/attachment_info" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_toRightOf="@+id/attachment_container" - android:layout_below="@+id/attachment_name" - android:layout_marginLeft="16dip" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/text_secondary_color" - android:singleLine="true" - android:ellipsize="middle" - /> - </RelativeLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:divider="?android:attr/dividerVertical" - android:showDividers="middle" - android:dividerPadding="8dip" - > - <Button - android:id="@+id/load" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_load_action" - android:visibility="gone" - /> - <Button - android:id="@+id/cancel" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_cancel_action" - android:visibility="gone" - /> - <Button - android:id="@+id/info" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_info_action" - android:visibility="gone" - /> - <Button - android:id="@+id/save" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_save_action" - android:visibility="gone" - /> - <Button - android:id="@+id/open" - style="@style/Attachment.Button" - android:text="@string/message_view_attachment_view_action" - android:visibility="gone" - /> - </LinearLayout> -</LinearLayout> diff --git a/email2/res/layout/message_view_details.xml b/email2/res/layout/message_view_details.xml deleted file mode 100644 index ece3c6b4e..000000000 --- a/email2/res/layout/message_view_details.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<TableLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_toLeftOf="@+id/show_details" - android:paddingTop="14dp" - android:paddingBottom="7dp" - android:orientation="vertical" - android:stretchColumns="2" - android:shrinkColumns="2" - > - <TableRow - android:id="@+id/date_row" - > - <TextView - android:layout_column="1" - android:text="@string/message_view_date_label" - style="@style/message_details_label" - /> - - <!-- Put in some margin on the right to accomodate for the "hide - details" icon --> - <TextView - android:id="@+id/date" - style="@style/message_details_value" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginRight="32dip" - /> - </TableRow> - <TableRow - android:id="@+id/to_row" - > - <TextView - android:layout_column="1" - android:text="@string/message_view_to_label" - style="@style/message_details_label" - /> - <TextView - android:id="@+id/to" - android:autoLink="email" - style="@style/message_details_value_selectable" - /> - </TableRow> - <TableRow - android:id="@+id/cc_row" - > - <TextView - android:layout_column="1" - android:text="@string/message_view_cc_label" - style="@style/message_details_label" - /> - <TextView - android:id="@+id/cc" - android:autoLink="email" - style="@style/message_details_value_selectable" - /> - </TableRow> - <TableRow - android:id="@+id/bcc_row" - > - <TextView - android:layout_column="1" - android:text="@string/message_view_bcc_label" - style="@style/message_details_label" - /> - <TextView - android:id="@+id/bcc" - android:autoLink="email" - style="@style/message_details_value_selectable" - /> - </TableRow> -</TableLayout> diff --git a/email2/res/layout/message_view_fragment.xml b/email2/res/layout/message_view_fragment.xml deleted file mode 100644 index 966bf5602..000000000 --- a/email2/res/layout/message_view_fragment.xml +++ /dev/null @@ -1,198 +0,0 @@ -<?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. ---> - -<!-- small --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/white" - > - <ProgressBar - android:id="@+id/loading_progress" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - style="?android:attr/progressBarStyleLarge" - /> - <com.android.email.view.NonLockingScrollView - android:id="@+id/main_panel" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <TextView - android:id="@+id/subject" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:layout_marginBottom="4dip" - android:layout_marginLeft="8dip" - android:layout_marginRight="8dip" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:textStyle="bold" - /> - <!-- Upper header area. --> - <include layout="@layout/message_view_header_upper" /> - - <!-- Addresses, timestamp, "show details" --> - <FrameLayout - android:id="@+id/message_view_subheader" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - > - <include layout="@layout/message_view_subheader" /> - </FrameLayout> - - <!-- divider --> - <View - android:layout_width="match_parent" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - style="@style/message_view_horizontal_divider" - /> - - <LinearLayout - android:id="@+id/message_tabs_section" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:orientation="vertical" - > - <Button - android:id="@+id/show_pictures" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="48dip" - android:drawableLeft="@drawable/ic_show_images_holo_light" - android:drawablePadding="8dip" - android:text="@string/message_view_show_pictures_action" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - - <Button - android:id="@+id/always_show_pictures_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="48dip" - android:drawableLeft="@drawable/ic_show_images_holo_light" - android:drawablePadding="8dip" - android:text="@string/message_view_always_show_pictures_prompt" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - > - <Button - android:id="@+id/show_message" - android:text="@string/message_view_show_message_action" - android:layout_width="wrap_content" - style="@style/message_view_tab" - /> - <!-- - 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_width="wrap_content" - style="@style/message_view_tab" - /> - <Button - android:id="@+id/show_attachments" - android:layout_width="wrap_content" - style="@style/message_view_tab" - /> - <View - android:layout_width="0dip" - android:layout_height="0dip" - android:layout_weight="1" - /> - </LinearLayout> - <View - android:layout_width="match_parent" - style="@style/message_view_horizontal_divider" - /> - </LinearLayout> - <!-- end of tab area --> - <!-- - content area - only one of them is visible at a time. - --> - <com.android.email.view.RigidWebView - android:id="@+id/message_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:background="@android:color/white" - android:visibility="gone" - /> - - <!-- TODO: remove these useless scroll views. They are carry-over - from an existing design and are no longer needed. --> - <!-- - 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="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:paddingTop="16dip" - android:paddingBottom="16dip" - 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="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - 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="@android:color/white" - /> - </ScrollView> - <!-- end of content area --> - </LinearLayout> - </com.android.email.view.NonLockingScrollView> -</FrameLayout> diff --git a/email2/res/layout/message_view_header_actions.xml b/email2/res/layout/message_view_header_actions.xml deleted file mode 100644 index dd55e8122..000000000 --- a/email2/res/layout/message_view_header_actions.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ImageButton - android:id="@+id/favorite" - style="@style/message_view_action_buttons" - android:src="@drawable/btn_star_off_convo_holo_light" - android:contentDescription="@string/favorite_action" - /> - <!-- Either reply or replyall will be set to gone in code depending on setting --> - <ImageButton - android:id="@+id/reply" - style="@style/message_view_action_buttons" - android:src="@drawable/ic_reply_holo_dark" - android:contentDescription="@string/reply_action" - /> - <ImageButton - android:id="@+id/reply_all" - style="@style/message_view_action_buttons" - android:src="@drawable/ic_reply_all_holo_dark" - android:contentDescription="@string/reply_all_action" - /> - <ImageButton - android:id="@+id/more" - style="@android:style/Widget.Holo.ActionButton.Overflow" - android:layout_width="48dip" - android:layout_height="match_parent" - /> -</merge> diff --git a/email2/res/layout/message_view_header_upper.xml b/email2/res/layout/message_view_header_upper.xml deleted file mode 100644 index c89bb8b1a..000000000 --- a/email2/res/layout/message_view_header_upper.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- Upper header area for a message view. This contains the message actions - (e.g. reply, forward), and sender info --> -<!-- Note the bottom padding is to compensate for the drop shadow in the asset --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="@dimen/message_header_height" - android:background="@drawable/header_convo_view_sender_bg_holo" - android:orientation="horizontal" - android:gravity="center_vertical" - > - <QuickContactBadge - android:id="@+id/badge" - android:layout_width="@dimen/message_header_badge_width" - android:layout_height="@dimen/message_header_badge_width" - android:scaleType="centerCrop" - /> - <View - android:layout_width="1dip" - android:layout_height="match_parent" - android:background="@android:color/white" - /> - <RelativeLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginLeft="@dimen/message_header_name_margin" - > - <TextView - android:id="@+id/from_name" - style="@style/message_header_sender_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - <ImageView - android:id="@+id/presence" - android:src="@android:drawable/presence_offline" - android:layout_below="@+id/from_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="2dip" - android:visibility="gone" - /> - <TextView - android:id="@+id/from_address" - style="@style/message_header_sender_address" - android:layout_below="@+id/from_name" - android:layout_toRightOf="@+id/presence" - android:layout_alignWithParentIfMissing="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14dip" - android:textColor="@color/text_secondary_color_inverse" - android:singleLine="true" - android:ellipsize="end" - /> - </RelativeLayout> - <include layout="@layout/message_view_header_actions" /> -</LinearLayout> - diff --git a/email2/res/layout/message_view_invitation.xml b/email2/res/layout/message_view_invitation.xml deleted file mode 100644 index 5efc05b81..000000000 --- a/email2/res/layout/message_view_invitation.xml +++ /dev/null @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<!-- Non-xlarge --> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/invite_section" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - > - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/message_view_invite_title" - android:textAppearance="?android:attr/textAppearanceSmall" - android:drawableLeft="@drawable/ic_badge_invite_holo_light" - android:layout_marginLeft="12dip" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - /> - - <Button - android:id="@+id/invite_link" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/message_view_invite_view" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginRight="3dip" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - /> - </RelativeLayout> - - <!-- Divider --> - <View - android:layout_width="match_parent" - android:layout_height="1px" - android:background="#ff808080" - /> - - <TextView - android:id="@+id/invite_info" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginTop="4dip" - android:layout_marginLeft="12dip" - android:layout_marginRight="6dip" - android:singleLine="true" - android:ellipsize="end" - android:text="@string/message_view_invite_text" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="44dip" - android:orientation="horizontal" - android:gravity="center_vertical" - android:layout_marginLeft="12dip" - android:layout_marginRight="6dip" - > - - <TextView - android:id="@+id/accept" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginRight="6dip" - android:text="@string/message_view_invite_accept" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:drawableLeft="@drawable/btn_yes_off" - android:gravity="center_vertical" - android:focusable="true" - /> - - <TextView - android:id="@+id/maybe" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginRight="6dip" - android:text="@string/message_view_invite_maybe" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:drawableLeft="@drawable/btn_maybe_off" - android:gravity="center_vertical" - android:focusable="true" - /> - - <TextView - android:id="@+id/decline" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/message_view_invite_decline" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:drawableLeft="@drawable/btn_no_off" - android:gravity="center_vertical" - android:focusable="true" - /> - - </LinearLayout> -</LinearLayout> diff --git a/email2/res/layout/message_view_subheader.xml b/email2/res/layout/message_view_subheader.xml deleted file mode 100644 index 026c92149..000000000 --- a/email2/res/layout/message_view_subheader.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- The expandable list of recipient addressese and date information at - the top of a message view --> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - - <!-- Collapsed version --> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/sub_header_contents_collapsed" - android:layout_width="match_parent" - android:layout_height="48dip" - android:gravity="center_vertical" - > - <!-- To, Cc, Bcc addresses --> - <TextView - android:id="@+id/addresses" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginLeft="8dip" - android:singleLine="true" - android:ellipsize="end" - style="@style/message_view_text" - /> - <TextView - android:id="@+id/datetime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:singleLine="true" - style="@style/message_view_text" - /> - <!-- Set proper background to reflect selected state --> - <ImageView - android:id="@+id/show_details" - android:src="@drawable/expander_open_holo_light" - android:layout_width="wrap_content" - android:layout_height="48dip" - android:layout_marginLeft="4dip" - android:scaleType="center" - android:background="?android:attr/selectableItemBackground" - /> - </LinearLayout> - - <!-- Expanded version --> - <FrameLayout - android:id="@+id/sub_header_contents_expanded" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" - > - - <include layout="@layout/message_view_details" /> - - <!-- Overlay the collapse details icon. - The height here needs to match the height of the collapsed subheader --> - <ImageView - android:id="@+id/show_details" - android:src="@drawable/expander_close_holo_light" - android:layout_width="wrap_content" - android:layout_height="48dip" - android:layout_marginLeft="4dip" - android:scaleType="center" - android:layout_gravity="right" - /> - </FrameLayout> - -</merge> - diff --git a/email2/res/layout/quoted_text.xml b/email2/res/layout/quoted_text.xml deleted file mode 100644 index 85b345589..000000000 --- a/email2/res/layout/quoted_text.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/quoted_text_area" - android:layout_height="wrap_content" - android:layout_width="match_parent"> - - <RelativeLayout android:layout_width="match_parent" - android:layout_height="48dip" - android:id="@+id/quoted_text_bar"> - - <RelativeLayout android:layout_width="wrap_content" - android:layout_height="match_parent" - android:id="@+id/quoted_text_row" - android:layout_alignParentLeft="true"> - - <CheckBox android:id="@+id/include_quoted_text" - android:layout_height="match_parent" - android:layout_width="wrap_content" - android:layout_alignParentLeft="true" - android:gravity="center_vertical" - android:contentDescription="@string/message_compose_quoted_text_label"/> - - <TextView - android:text="@string/message_compose_quoted_text_label" - android:textAllCaps="true" - android:layout_height="match_parent" - android:layout_width="wrap_content" - android:layout_marginLeft="8dip" - style="@style/QuotedTextHeaderStyle" - android:layout_toRightOf="@+id/include_quoted_text" - android:gravity="center_vertical|left"/> - </RelativeLayout> - - </RelativeLayout> - - <View - android:layout_width="match_parent" - android:layout_height="2dip" - android:background="#babebe" - android:layout_below="@id/quoted_text_bar" - android:id="@+id/divider_bar" /> - - <WebView android:id="@+id/quoted_text" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_below="@id/divider_bar" /> - -</RelativeLayout> diff --git a/email2/res/layout/widget.xml b/email2/res/layout/widget.xml deleted file mode 100644 index 397be4362..000000000 --- a/email2/res/layout/widget.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="48dip" - android:gravity="center_vertical" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:orientation="horizontal" - android:background="@drawable/header_bg_email_widget_holo"> - <ImageView - android:id="@+id/widget_logo" - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_marginRight="8dip" - android:src="@mipmap/ic_launcher_email" /> - <LinearLayout - android:id="@+id/widget_header" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="vertical"> - <TextView - android:id="@+id/widget_title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/widget_all_mail" - android:textColor="@color/widget_title_color" - /> - <TextView - android:id="@+id/widget_tap" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/widget_other_views" - android:textColor="@color/widget_title_color" - /> - </LinearLayout> - <!-- Note: We can't set "freezesText" on the widget_unread_count view, as the launcher can - restore stale data over updated data. --> - <TextView - android:id="@+id/widget_count" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="12dip" - android:textSize="36sp" - android:textStyle="bold" - android:textColor="@color/widget_unread_color" /> - <ImageView - android:id="@+id/widget_compose" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_menu_compose_normal_holo_light" /> - </LinearLayout> - <ListView - android:id="@+id/message_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:cacheColorHint="#00000000" - android:background="@drawable/gradient_bg_email_widget_holo" /> - - <!-- TODO: remove this tap to configure logic. It's obsolete. --> - <TextView - android:id="@+id/tap_to_configure" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dip" - android:layout_marginRight="5dip" - android:layout_weight="1" - android:layout_gravity="fill" - android:gravity="center" - android:text="@string/widget_touch_to_configure" - android:textSize="16sp" - android:visibility="gone"/> - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/list_div_top_btm_email_widget_holo" /> -</LinearLayout> diff --git a/email2/res/layout/widget_list_item.xml b/email2/res/layout/widget_list_item.xml deleted file mode 100644 index b447f98b8..000000000 --- a/email2/res/layout/widget_list_item.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/widget_message" - android:layout_width="match_parent" - android:layout_height="64sp" - android:background="@drawable/conversation_unread_selector" - > - <ImageView - android:id="@+id/color_chip" - android:layout_width="32dip" - android:layout_height="4dip" - android:layout_marginRight="16dip" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:visibility="visible" - /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:layout_centerVertical="true" - android:orientation="vertical" - > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - > - <TextView - android:id="@+id/widget_from" - style="@style/widget_list_item" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingRight="16dip" - android:singleLine="true" /> - <!-- Use negative margins to align attachment icon with text --> - <ImageView - android:id="@+id/widget_invite" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="-4sp" - android:src="@drawable/ic_badge_invite_holo_light" /> - <ImageView - android:id="@+id/widget_attachment" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="-4sp" - android:src="@drawable/ic_attachment_holo_light" /> - <TextView - android:id="@+id/widget_date" - style="@style/widget_list_item" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </LinearLayout> - <TextView - android:id="@+id/widget_subject" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/widget_list_item" - android:layout_marginTop="-4sp" - android:maxLines="2"/> - </LinearLayout> -</RelativeLayout> diff --git a/email2/res/layout/widget_loading.xml b/email2/res/layout/widget_loading.xml deleted file mode 100644 index a25e32de0..000000000 --- a/email2/res/layout/widget_loading.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:layout_width="fill_parent" - android:layout_height="50dip" - android:orientation="horizontal"> - <TextView - android:id="@+id/loading_text" - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:gravity="center" - android:textColor="#60FFFFFF" - android:textSize="20sp" - android:shadowColor="#FF000000" - android:shadowDx="0.0" - android:shadowDy="1.0" - android:shadowRadius="2.0" /> -</LinearLayout>
\ No newline at end of file diff --git a/email2/res/xml-sw600dp/widget_info.xml b/email2/res/xml-sw600dp/widget_info.xml deleted file mode 100644 index fa4635dbe..000000000 --- a/email2/res/xml-sw600dp/widget_info.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 Google Inc. - Licensed to 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. ---> - -<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" - android:minWidth="220dp" - android:minHeight="220dp" - android:updatePeriodMillis="0" - android:previewImage="@drawable/mail_widget_preview" - android:initialLayout="@layout/widget" - android:configure="com.android.email2.ui.MailboxSelectionActivityEmail" - android:resizeMode="horizontal|vertical"> -</appwidget-provider> diff --git a/email2/res/xml/widget_info.xml b/email2/res/xml/widget_info.xml deleted file mode 100644 index 8dc4e3dbd..000000000 --- a/email2/res/xml/widget_info.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 Google Inc. - Licensed to 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. ---> - -<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" - android:minWidth="180dp" - android:minHeight="180dp" - android:minResizeWidth="180dp" - android:minResizeHeight="110dp" - android:updatePeriodMillis="0" - android:previewImage="@drawable/mail_widget_preview" - android:initialLayout="@layout/widget" - android:configure="com.android.email2.ui.MailboxSelectionActivityEmail" - android:resizeMode="horizontal|vertical"> -</appwidget-provider> diff --git a/email2/src/com/android/email/provider/EmailProvider.java b/email2/src/com/android/email/provider/EmailProvider.java index bc0e9d99d..41e8fe946 100644 --- a/email2/src/com/android/email/provider/EmailProvider.java +++ b/email2/src/com/android/email/provider/EmailProvider.java @@ -1922,6 +1922,19 @@ outer: private static final String NOT_A_DRAFT_STRING = Integer.toString(UIProvider.DraftType.NOT_A_DRAFT); + private static String getConversationFlags() { + return + "CASE WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_INCOMING_MEETING_INVITE + + ") !=0 THEN " + UIProvider.ConversationFlags.CALENDAR_INVITE + + " ELSE 0 END + " + + "CASE WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_FORWARDED + + ") !=0 THEN " + UIProvider.ConversationFlags.FORWARDED + + " ELSE 0 END + " + + "CASE WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_REPLIED_TO + + ") !=0 THEN " + UIProvider.ConversationFlags.REPLIED + + " ELSE 0 END"; + } + /** * Mapping of UIProvider columns to EmailProvider columns for the message list (called the * conversation list in UnifiedEmail) @@ -1942,9 +1955,10 @@ outer: .add(UIProvider.ConversationColumns.PRIORITY, Integer.toString(ConversationPriority.LOW)) .add(UIProvider.ConversationColumns.READ, MessageColumns.FLAG_READ) .add(UIProvider.ConversationColumns.STARRED, MessageColumns.FLAG_FAVORITE) - .add(UIProvider.ConversationColumns.FOLDER_LIST, - "'content://" + EmailContent.AUTHORITY + "/uifolder/' || " - + MessageColumns.MAILBOX_KEY) + .add(UIProvider.ConversationColumns.FOLDER_LIST, + "'content://" + EmailContent.AUTHORITY + "/uifolder/' || " + + MessageColumns.MAILBOX_KEY) + .add(UIProvider.ConversationColumns.FLAGS, getConversationFlags()) .build(); /** |