Initial commit - This source code should be EXACTLY what the current version of the 'Email' application in the android repo looks like as of this date.

2024-11-23 09:52:16 -05:00 · 2008-10-28 01:04:44 +00:00 · 2008-10-28 01:04:44 +00:00 · ffd7766384
commit ffd7766384
parent 379cc47671
365 changed files with 56519 additions and 0 deletions
--- a/Android.mk
+++ b/Android.mk
@ -0,0 +1,10 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := eng
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_PACKAGE_NAME := Email
 include $(BUILD_PACKAGE)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -0,0 +1,132 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.email">
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.READ_OWNER_DATA"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.VIBRATE"/>
    <permission android:name="com.android.email.permission.READ_ATTACHMENT"
                android:permissionGroup="android.permission-group.MESSAGES"
                android:protectionLevel="dangerous"
                android:label="@string/read_attachment_label"
                android:description="@string/read_attachment_desc"/>
    <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/>
    <application android:icon="@drawable/icon" android:label="@string/app_name"
        android:name="Email">
        <activity android:name=".activity.Welcome">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupBasics"
            android:label="@string/account_setup_basics_title"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupAccountType"
            android:label="@string/account_setup_account_type_title"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupIncoming"
            android:label="@string/account_setup_incoming_title"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupOutgoing"
            android:label="@string/account_setup_outgoing_title"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupOptions"
            android:label="@string/account_setup_options_title"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSetupNames"
            android:label="@string/account_setup_names_title"
            >
        </activity>
        <!-- XXX Note: this activity is hacked to ignore config changes,
             since it doesn't currently handle them correctly in code. -->
        <activity
            android:name=".activity.setup.AccountSetupCheckSettings"
            android:label="@string/account_setup_check_settings_title"
            android:configChanges="keyboardHidden|orientation"
            >
        </activity>
        <activity
            android:name=".activity.setup.AccountSettings"
            android:label="@string/account_settings_title_fmt"
            >
        </activity>
        <activity
            android:name=".activity.Debug"
            android:label="@string/debug_title">
        </activity>
        <activity
            android:name=".activity.Accounts"
            android:label="@string/accounts_title">
        </activity>
        <activity
            android:name=".activity.FolderMessageList">
        </activity>
        <activity
            android:name=".activity.MessageView">
        </activity>
        <activity
            android:name=".activity.MessageCompose"
            android:label="@string/app_name"
            android:enabled="false"
            >
            <intent-filter>
                <action android:name="android.intent.action.SENDTO" />
                <data android:scheme="mailto" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.SEND" />
                <data android:mimeType="image/*" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <data android:scheme="mailto" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
            </intent-filter>
        </activity>
        <receiver android:name=".service.BootReceiver"
              android:enabled="false"
              >
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.DEVICE_STORAGE_LOW" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.DEVICE_STORAGE_OK" />
            </intent-filter>
        </receiver>
        <service
            android:name=".service.MailService"
            android:enabled="false"
            >
        </service>
        <provider
            android:name=".provider.AttachmentProvider"
            android:authorities="com.android.email.attachmentprovider"
            android:multiprocess="true"
            android:grantUriPermissions="true"
            android:readPermission="com.android.email.permission.READ_ATTACHMENT"
            />
    </application>
 </manifest>
--- a/0
+++ b/0
--- a/190
+++ b/190
@ -0,0 +1,190 @@
   Copyright (c) 2005-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.
   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.
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
--- a/assets/empty.html
+++ b/assets/empty.html
@ -0,0 +1,4 @@
 <html>
 	<body bgcolor="white">
 	</body>
 </html>
--- a/assets/loading.gif
+++ b/assets/loading.gif
--- a/assets/loading.html
+++ b/assets/loading.html
@ -0,0 +1,17 @@
 <html>
 	<body bgcolor="white">
 		<table width="100%" height="100%">
 			<tr>
 				<td align="center" valign="center">
 					<font color="gray">Loading...</font>
 					<br/>
 					<br/>
 					<br/>
 					<br/>
 					<br/>
 					<img src="loading.gif">
 				</td>
 			</tr>
 		</table>
 	</body>
 </html>
--- a/assets/test.html
+++ b/assets/test.html
@ -0,0 +1,18 @@
 <html>
 	<body>
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus dui dui, luctus sit amet, hendrerit ac, blandit quis, diam. Duis libero velit, elementum id, mattis ut, fermentum aliquet, tortor. Maecenas tincidunt egestas pede. Integer sagittis ipsum ut lorem. Morbi egestas egestas sapien. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eget erat ac sem iaculis sollicitudin. Maecenas in velit id mauris cursus tincidunt. Sed ultrices elit in sapien ullamcorper imperdiet. Nunc viverra, lacus id varius elementum, nisl turpis lacinia tellus, sit amet viverra neque odio quis nisl. Quisque facilisis, ipsum non vulputate malesuada, leo augue elementum tortor, nec eleifend tellus lectus non massa.
 <br/><br/>
 Maecenas pulvinar rutrum risus. Phasellus mattis arcu sit amet neque. Aliquam sed quam at nulla laoreet pretium. Proin elit. Integer ullamcorper dolor a pede. Nam lobortis quam ut mauris. Pellentesque non mauris ut lacus hendrerit iaculis. In volutpat nulla et turpis. Fusce mollis. Aliquam sit amet tortor fermentum orci lacinia convallis. Donec tincidunt tortor sed erat sollicitudin gravida. In hac habitasse platea dictumst. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed pulvinar arcu consectetuer dolor. Nunc luctus aliquam leo. In hac habitasse platea dictumst. Praesent et mi sit amet ligula blandit hendrerit. Nam aliquam tincidunt est. Aliquam erat volutpat.
 <br/><br/>
 Curabitur augue. Fusce pulvinar nisi vitae diam. Donec dictum. Sed suscipit convallis magna. Ut hendrerit tortor in mauris. In at diam. Maecenas commodo. Aliquam erat volutpat. Nunc odio eros, vestibulum at, sodales id, congue et, risus. Curabitur feugiat blandit lacus. Nulla gravida placerat enim. Nunc turpis. Praesent malesuada.
 <br/><br/>
 Aenean quis erat. Vivamus non ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed metus magna, porta eu, ultricies vitae, vulputate et, urna. Sed pulvinar, massa at ultricies rhoncus, nunc eros dapibus felis, quis congue risus orci rhoncus nibh. Pellentesque quam ante, laoreet vitae, iaculis a, gravida in, nibh. In hac habitasse platea dictumst. Aliquam erat volutpat. Suspendisse augue neque, posuere eu, sollicitudin quis, sagittis et, massa. Maecenas varius sem sodales ipsum. Donec congue mi nec orci. Nam pede ipsum, varius sed, condimentum ac, rhoncus non, lorem. Integer vestibulum, neque vitae ornare euismod, mauris turpis congue massa, non venenatis arcu lorem eget metus. Sed sollicitudin, enim aliquam pharetra cursus, neque augue bibendum leo, vitae ullamcorper ante felis nec massa. Maecenas vitae urna. Proin tincidunt, urna eu sodales vulputate, nisl tellus pretium ligula, ut venenatis metus nulla eu lectus. Integer urna purus, sagittis ut, posuere sed, sagittis non, mauris. Nunc eros risus, lacinia sit amet, dictum in, faucibus quis, urna. Fusce dictum mattis enim. Vivamus luctus sagittis felis.
 <br/><br/>
 Fusce pulvinar, erat a facilisis congue, lacus libero imperdiet dui, nec luctus justo neque sit amet mauris. Praesent sodales. Sed sed nisl a arcu tempus placerat. Duis sagittis risus. Aliquam tristique. Ut a mi. Integer volutpat, turpis vitae lobortis blandit, lorem sapien suscipit arcu, sit amet dignissim felis mauris vitae ipsum. Sed elit. Mauris elementum, pede nec accumsan pretium, leo metus fringilla erat, at feugiat turpis arcu pretium urna. Morbi lorem tellus, commodo sed, convallis id, suscipit sed, leo. Donec egestas ultricies tellus. Curabitur sapien orci, interdum nec, molestie at, pharetra eu, magna. Duis pharetra orci sed felis posuere malesuada. Donec nec nisi non urna ultricies porttitor. Maecenas lectus. Sed dignissim malesuada justo. Nunc rutrum consectetuer nunc.
 	<img src="cid:23978198273">
 	more text
 	<img src="cid:12371982371">
 	more text
 	</body>
 </html>
--- a/docs/NOTES
+++ b/docs/NOTES
--- a/docs/TESTS
+++ b/docs/TESTS
@ -0,0 +1,23 @@
 Some simple functional tests
 --
 Compose a message
    Attach an image to the message
    Save the message as a draft
    Reopen the draft
    * Is the attachment still there?
    Send the message.
    * Does the received message have the correct attachment?
 Check delete functionality on POP and IMAP account.
 Check delete functionality on IMAP with no network connection.
 Check save draft functionality on POP and IMAP account.
 Check save draft functionality on IMAP with no network connection.
 Check sent message functionality on POP and IMAP account.
 Check sent functionality on IMAP with no network connection.
    * When the network is brought back does the sent message get uploaded?
--- a/docs/TODO
+++ b/docs/TODO
@ -0,0 +1,27 @@
 Currently
 --
 Need to add NOOP checking to Pop3Store and ImapStore on cached connections.
 In the future
 --
 Move attachments to files, instead of storing as blobs in the database. There are tons of ways
 we can make the app perform better with this small change. Primarily, we can do everything
 pertaining to large attachments as streams instead of as large loads into byte arrays.
 Get rid of the LocalStore's attachment to Store altogether. Local storage is too complex and
 specific to performance to be bound to the Store API. It needs to be flexible with plenty of helper
 functions to make best use of memory and resources.
 Make better use of the abstractions for Body, Part and BodyPart. Proper use of these abstractions
 can completely remove the need for the special headers.
--- a/images/Android
+++ b/images/Android
--- a/images/Android.ai
+++ b/images/Android.ai
--- a/res/drawable-land/bottombar_565.png
+++ b/res/drawable-land/bottombar_565.png
--- a/res/drawable/appointment_indicator_leftside_1.9.png
+++ b/res/drawable/appointment_indicator_leftside_1.9.png
--- a/res/drawable/appointment_indicator_leftside_10.9.png
+++ b/res/drawable/appointment_indicator_leftside_10.9.png
--- a/res/drawable/appointment_indicator_leftside_11.9.png
+++ b/res/drawable/appointment_indicator_leftside_11.9.png
--- a/res/drawable/appointment_indicator_leftside_12.9.png
+++ b/res/drawable/appointment_indicator_leftside_12.9.png
--- a/res/drawable/appointment_indicator_leftside_13.9.png
+++ b/res/drawable/appointment_indicator_leftside_13.9.png
--- a/res/drawable/appointment_indicator_leftside_14.9.png
+++ b/res/drawable/appointment_indicator_leftside_14.9.png
--- a/res/drawable/appointment_indicator_leftside_15.9.png
+++ b/res/drawable/appointment_indicator_leftside_15.9.png
--- a/res/drawable/appointment_indicator_leftside_16.9.png
+++ b/res/drawable/appointment_indicator_leftside_16.9.png
--- a/res/drawable/appointment_indicator_leftside_17.9.png
+++ b/res/drawable/appointment_indicator_leftside_17.9.png
--- a/res/drawable/appointment_indicator_leftside_18.9.png
+++ b/res/drawable/appointment_indicator_leftside_18.9.png
--- a/res/drawable/appointment_indicator_leftside_19.9.png
+++ b/res/drawable/appointment_indicator_leftside_19.9.png
--- a/res/drawable/appointment_indicator_leftside_2.9.png
+++ b/res/drawable/appointment_indicator_leftside_2.9.png
--- a/res/drawable/appointment_indicator_leftside_20.9.png
+++ b/res/drawable/appointment_indicator_leftside_20.9.png
--- a/res/drawable/appointment_indicator_leftside_21.9.png
+++ b/res/drawable/appointment_indicator_leftside_21.9.png
--- a/res/drawable/appointment_indicator_leftside_3.9.png
+++ b/res/drawable/appointment_indicator_leftside_3.9.png
--- a/res/drawable/appointment_indicator_leftside_4.9.png
+++ b/res/drawable/appointment_indicator_leftside_4.9.png
--- a/res/drawable/appointment_indicator_leftside_5.9.png
+++ b/res/drawable/appointment_indicator_leftside_5.9.png
--- a/res/drawable/appointment_indicator_leftside_6.9.png
+++ b/res/drawable/appointment_indicator_leftside_6.9.png
--- a/res/drawable/appointment_indicator_leftside_7.9.png
+++ b/res/drawable/appointment_indicator_leftside_7.9.png
--- a/res/drawable/appointment_indicator_leftside_8.9.png
+++ b/res/drawable/appointment_indicator_leftside_8.9.png
--- a/res/drawable/appointment_indicator_leftside_9.9.png
+++ b/res/drawable/appointment_indicator_leftside_9.9.png
--- a/res/drawable/attached_image_placeholder.png
+++ b/res/drawable/attached_image_placeholder.png
--- a/res/drawable/bottombar_565.png
+++ b/res/drawable/bottombar_565.png
--- a/res/drawable/btn_dialog.xml
+++ b/res/drawable/btn_dialog.xml
@ -0,0 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2007 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.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_window_focused="false" android:state_enabled="true"
        android:drawable="@drawable/btn_dialog_normal" />
    <item android:state_window_focused="false" android:state_enabled="false"
        android:drawable="@drawable/btn_dialog_disable" />
    <item android:state_pressed="true"
        android:drawable="@drawable/btn_dialog_pressed" />
    <item android:state_enabled="true" android:state_focused="true"
        android:drawable="@drawable/btn_dialog_selected" />
    <item android:drawable="@drawable/btn_dialog_normal" />
 </selector>
--- a/res/drawable/btn_dialog_disable.png
+++ b/res/drawable/btn_dialog_disable.png
--- a/res/drawable/btn_dialog_disable_focused.png
+++ b/res/drawable/btn_dialog_disable_focused.png
--- a/res/drawable/btn_dialog_normal.png
+++ b/res/drawable/btn_dialog_normal.png
--- a/res/drawable/btn_dialog_pressed.png
+++ b/res/drawable/btn_dialog_pressed.png
--- a/res/drawable/btn_dialog_selected.png
+++ b/res/drawable/btn_dialog_selected.png
--- a/res/drawable/button_indicator_next.png
+++ b/res/drawable/button_indicator_next.png
--- a/res/drawable/divider_horizontal_email.9.png
+++ b/res/drawable/divider_horizontal_email.9.png
--- a/res/drawable/email_quoted_bar.9.png
+++ b/res/drawable/email_quoted_bar.9.png
--- a/res/drawable/expander_ic_folder.xml
+++ b/res/drawable/expander_ic_folder.xml
@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_expanded="true"
        android:drawable="@drawable/expander_ic_folder_maximized" />
    <item android:drawable="@drawable/expander_ic_folder_minimized" />
 </selector> 
--- a/res/drawable/expander_ic_folder_maximized.9.png
+++ b/res/drawable/expander_ic_folder_maximized.9.png
--- a/res/drawable/expander_ic_folder_minimized.9.png
+++ b/res/drawable/expander_ic_folder_minimized.9.png
--- a/res/drawable/folder_message_list_child_background.xml
+++ b/res/drawable/folder_message_list_child_background.xml
@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_window_focused="false" android:state_selected="true"
        android:drawable="@color/folder_message_list_child_background" />
    <item android:state_selected="true"
        android:drawable="@android:color/transparent" />
    <item android:state_pressed="true" android:state_selected="false"
        android:drawable="@android:color/transparent" />
    <item android:state_selected="false"
        android:drawable="@color/folder_message_list_child_background" />
 </selector>
--- a/res/drawable/ic_delete.png
+++ b/res/drawable/ic_delete.png
--- a/res/drawable/ic_email_attachment.png
+++ b/res/drawable/ic_email_attachment.png
--- a/res/drawable/ic_email_attachment_small.png
+++ b/res/drawable/ic_email_attachment_small.png
--- a/res/drawable/ic_email_caret_double_light.png
+++ b/res/drawable/ic_email_caret_double_light.png
--- a/res/drawable/ic_email_caret_single_light.png
+++ b/res/drawable/ic_email_caret_single_light.png
--- a/res/drawable/ic_email_thread_open_bottom_default.9.png
+++ b/res/drawable/ic_email_thread_open_bottom_default.9.png
--- a/res/drawable/ic_email_thread_open_top_default.9.png
+++ b/res/drawable/ic_email_thread_open_top_default.9.png
--- a/res/drawable/ic_menu_account_list.png
+++ b/res/drawable/ic_menu_account_list.png
--- a/res/drawable/ic_menu_add.png
+++ b/res/drawable/ic_menu_add.png
--- a/res/drawable/ic_menu_archive.png
+++ b/res/drawable/ic_menu_archive.png
--- a/res/drawable/ic_menu_attachment.png
+++ b/res/drawable/ic_menu_attachment.png
--- a/res/drawable/ic_menu_cc.png
+++ b/res/drawable/ic_menu_cc.png
--- a/res/drawable/ic_menu_close_clear_cancel.png
+++ b/res/drawable/ic_menu_close_clear_cancel.png
--- a/res/drawable/ic_menu_compose.png
+++ b/res/drawable/ic_menu_compose.png
--- a/res/drawable/ic_menu_delete.png
+++ b/res/drawable/ic_menu_delete.png
--- a/res/drawable/ic_menu_edit.png
+++ b/res/drawable/ic_menu_edit.png
--- a/res/drawable/ic_menu_forward_mail.png
+++ b/res/drawable/ic_menu_forward_mail.png
--- a/res/drawable/ic_menu_inbox.png
+++ b/res/drawable/ic_menu_inbox.png
--- a/res/drawable/ic_menu_mark.png
+++ b/res/drawable/ic_menu_mark.png
--- a/res/drawable/ic_menu_navigate.png
+++ b/res/drawable/ic_menu_navigate.png
--- a/res/drawable/ic_menu_preferences.png
+++ b/res/drawable/ic_menu_preferences.png
--- a/res/drawable/ic_menu_refresh.png
+++ b/res/drawable/ic_menu_refresh.png
--- a/res/drawable/ic_menu_reply.png
+++ b/res/drawable/ic_menu_reply.png
--- a/res/drawable/ic_menu_reply_all.png
+++ b/res/drawable/ic_menu_reply_all.png
--- a/res/drawable/ic_menu_save_draft.png
+++ b/res/drawable/ic_menu_save_draft.png
--- a/res/drawable/ic_menu_search.png
+++ b/res/drawable/ic_menu_search.png
--- a/res/drawable/ic_menu_send.png
+++ b/res/drawable/ic_menu_send.png
--- a/res/drawable/ic_mms_attachment_small.png
+++ b/res/drawable/ic_mms_attachment_small.png
--- a/res/drawable/icon.png
+++ b/res/drawable/icon.png
--- a/res/drawable/stat_notify_email_generic.png
+++ b/res/drawable/stat_notify_email_generic.png
--- a/res/drawable/text_box.9.png
+++ b/res/drawable/text_box.9.png
--- a/res/drawable/text_box_light.9.png
+++ b/res/drawable/text_box_light.9.png
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@ -0,0 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="@android:color/white">
    <ScrollView
        android:layout_width="fill_parent"
        android:layout_height="0dip"
        android:layout_weight="1"
        android:scrollbarStyle="outsideInset"
        android:fadingEdge="none">
        <LinearLayout
            android:orientation="vertical"
            android:layout_width="fill_parent"
            android:layout_height="0dip"
            android:layout_weight="1">
            <include layout="@layout/message_view_header" />
        </LinearLayout>
    </ScrollView>
    <LinearLayout
        android:orientation="horizontal"
        android:layout_width="fill_parent"
        android:layout_height="57px"
        android:background="@drawable/ic_email_thread_open_bottom_default"
        android:gravity="center_vertical">
        <Button
            android:id="@+id/reply"
            android:text="@string/reply_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
        <Button
            android:id="@+id/reply_all"
            android:text="@string/reply_all_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
        <Button
            android:id="@+id/delete"
            android:text="@string/delete_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
    </LinearLayout>
 </LinearLayout>
--- a/res/layout/account_setup_account_type.xml
+++ b/res/layout/account_setup_account_type.xml
@ -0,0 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
      android:layout_height="fill_parent"
    android:orientation="vertical"
      >
      <TextView
          android:text="@string/account_setup_account_type_instructions"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?android:attr/textColorPrimary"
          />
    <Button
        android:id="@+id/pop"
        android:text="@string/account_setup_account_type_pop_action"
        android:layout_height="wrap_content"
        android:layout_width="150sp"
        android:minWidth="@dimen/button_minWidth"
        android:layout_gravity="center_horizontal"
        />
    <Button
        android:id="@+id/imap"
        android:text="@string/account_setup_account_type_imap_action"
        android:layout_height="wrap_content"
        android:layout_width="150sp"
        android:minWidth="@dimen/button_minWidth"
        android:layout_gravity="center_horizontal"
        />
 </LinearLayout>
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@ -0,0 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:orientation="vertical"
      >
      <TextView
        android:text="@string/account_setup_basics_instructions"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?android:attr/textColorPrimary"
          />
    <EditText
        android:id="@+id/account_email"
        android:hint="@string/account_setup_basics_email_hint"
        android:singleLine="true"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        />
    <EditText
        android:id="@+id/account_password"
        android:hint="@string/account_setup_basics_password_hint"
        android:password="true"
        android:singleLine="true"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:nextFocusDown="@+id/next"
        />
    <CheckBox
        android:id="@+id/account_default"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:text="@string/account_setup_basics_default_label"
        android:visibility="gone"
        />
    <View
        android:layout_width="fill_parent"
        android:layout_height="0px"
        android:layout_weight="1"
        />
    <RelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="54px"
        android:background="@drawable/bottombar_565"
        >
        <Button
            android:id="@+id/manual_setup"
            android:text="@string/account_setup_basics_manual_setup_action"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:minWidth="@dimen/button_minWidth"
            android:layout_alignParentLeft="true"
            android:layout_centerVertical="true"
            />
        <Button
            android:id="@+id/next"
            android:text="@string/next_action"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:minWidth="@dimen/button_minWidth"
            android:drawableRight="@drawable/button_indicator_next"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true"
            />
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@ -0,0 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:orientation="vertical">
    <View
        android:layout_width="fill_parent"
        android:layout_height="100sp" />
    <TextView
        android:id="@+id/message"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:gravity="center_horizontal"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?android:attr/textColorPrimary"
        android:paddingBottom="6px" />
    <ProgressBar
        android:id="@+id/progress"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        style="?android:attr/progressBarStyleHorizontal" />
    <View
        android:layout_width="fill_parent"
        android:layout_height="0px"
        android:layout_weight="1" />
    <RelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="54px"
        android:background="@drawable/bottombar_565">
        <Button
            android:id="@+id/cancel"
            android:text="@string/cancel_action"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:minWidth="@dimen/button_minWidth"
            android:layout_centerVertical="true" />
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@ -0,0 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:scrollbarStyle="outsideInset">
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:orientation="vertical">
        <TextView
            android:text="@string/account_setup_incoming_username_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_username"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:text="@string/account_setup_incoming_password_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_password"
            android:password="true"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <!-- This text may be changed in code if the server is IMAP, etc. -->
        <TextView
            android:id="@+id/account_server_label"
            android:text="@string/account_setup_incoming_pop_server_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_server"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:text="@string/account_setup_incoming_port_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_port"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:text="@string/account_setup_incoming_security_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <Spinner
            android:id="@+id/account_security_type"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:id="@+id/account_delete_policy_label"
            android:text="@string/account_setup_incoming_delete_policy_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <Spinner
            android:id="@+id/account_delete_policy"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <LinearLayout
            android:id="@+id/imap_path_prefix_section"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical">
            <TextView
                android:text="@string/account_setup_incoming_imap_path_prefix_label"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorPrimary" />
            <EditText
                android:id="@+id/imap_path_prefix"
                android:hint="@string/account_setup_incoming_imap_path_prefix_hint"
                android:singleLine="true"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent" />
        </LinearLayout>
        <View
            android:layout_width="fill_parent"
            android:layout_height="0px"
            android:layout_weight="1" />
        <RelativeLayout
            android:layout_width="fill_parent"
            android:layout_height="54px"
            android:background="@drawable/bottombar_565">
            <Button
                android:id="@+id/next"
                android:text="@string/next_action"
                android:layout_height="wrap_content"
                android:layout_width="wrap_content"
                android:minWidth="@dimen/button_minWidth"
                android:drawableRight="@drawable/button_indicator_next"
                android:layout_alignParentRight="true"
                android:layout_centerVertical="true" />
        </RelativeLayout>
    </LinearLayout>
 </ScrollView>
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@ -0,0 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:orientation="vertical">
    <TextView
        android:text="@string/account_setup_names_instructions"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?android:attr/textColorPrimary" />
    <TextView
        android:text="@string/account_setup_names_account_name_label"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorPrimary" />
    <EditText
        android:id="@+id/account_description"
        android:singleLine="true"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent" />
    <TextView
        android:text="@string/account_setup_names_user_name_label"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorPrimary" />
    <EditText
        android:id="@+id/account_name"
        android:singleLine="true"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent" />
    <View
        android:layout_height="0px"
        android:layout_width="fill_parent"
        android:layout_weight="1" />
    <RelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="54px"
        android:background="@drawable/bottombar_565">
        <Button
            android:id="@+id/done"
            android:text="@string/done_action"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:minWidth="@dimen/button_minWidth"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true" />
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@ -0,0 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:orientation="vertical">
    <TextView
        android:text="@string/account_setup_options_mail_check_frequency_label"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorPrimary" />
    <Spinner
        android:id="@+id/account_check_frequency"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent" />
    <CheckBox
        android:id="@+id/account_default"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:text="@string/account_setup_options_default_label" />
    <CheckBox
        android:id="@+id/account_notify"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:text="@string/account_setup_options_notify_label" />
    <View
        android:layout_width="fill_parent"
        android:layout_height="0px"
        android:layout_weight="1" />
    <RelativeLayout
        android:layout_width="fill_parent"
        android:layout_height="54px"
        android:background="@drawable/bottombar_565">
        <Button
            android:id="@+id/next"
            android:text="@string/next_action"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:minWidth="@dimen/button_minWidth"
            android:drawableRight="@drawable/button_indicator_next"
            android:layout_alignParentRight="true"
            android:layout_centerVertical="true" />
    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@ -0,0 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:scrollbarStyle="outsideInset">
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:orientation="vertical">
        <TextView
            android:text="@string/account_setup_outgoing_smtp_server_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_server"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:text="@string/account_setup_outgoing_port_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <EditText
            android:id="@+id/account_port"
            android:singleLine="true"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <TextView
            android:text="@string/account_setup_outgoing_security_label"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorPrimary" />
        <Spinner
            android:id="@+id/account_security_type"
            android:layout_height="wrap_content"
            android:layout_width="fill_parent" />
        <CheckBox
            android:id="@+id/account_require_login"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:text="@string/account_setup_outgoing_require_login_label" />
        <LinearLayout
            android:id="@+id/account_require_login_settings"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
            android:orientation="vertical"
            android:visibility="gone">
            <TextView
                android:text="@string/account_setup_outgoing_username_label"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorPrimary" />
            <EditText
                android:id="@+id/account_username"
                android:singleLine="true"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent" />
            <TextView
                android:text="@string/account_setup_outgoing_password_label"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorPrimary" />
            <EditText
                android:id="@+id/account_password"
                android:password="true"
                android:singleLine="true"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent" />
        </LinearLayout>
        <View
            android:layout_width="fill_parent"
            android:layout_height="0px"
            android:layout_weight="1" />
        <RelativeLayout
            android:layout_width="fill_parent"
            android:layout_height="54px"
            android:background="@drawable/bottombar_565">
            <Button
                android:id="@+id/next"
                android:text="@string/next_action"
                android:layout_height="wrap_content"
                android:layout_width="wrap_content"
                android:minWidth="@dimen/button_minWidth"
                android:drawableRight="@drawable/button_indicator_next"
                android:layout_alignParentRight="true"
                android:layout_centerVertical="true" />
        </RelativeLayout>
    </LinearLayout>
 </ScrollView>
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@ -0,0 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent">
    <ListView
        android:id="@android:id/list"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        />
    <LinearLayout
        android:id="@+id/empty"
        android:layout_width="fill_parent"
        android:layout_height="fill_parent"
        android:orientation="vertical">
        <TextView
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:textSize="20sp"
            android:text="@string/accounts_welcome"
            android:textColor="?android:attr/textColorPrimary" />
        <View
            android:layout_width="fill_parent"
            android:layout_height="0px"
            android:layout_weight="1" />
        <RelativeLayout
            android:layout_width="fill_parent"
            android:layout_height="54px"
            android:background="@drawable/bottombar_565">
            <Button
                android:id="@+id/add_new_account"
                android:layout_width="wrap_content"
                android:minWidth="@dimen/button_minWidth"
                android:layout_height="wrap_content"
                android:text="@string/next_action"
                android:drawableRight="@drawable/button_indicator_next"
                android:layout_alignParentRight="true"
                android:layout_centerVertical="true" />
        </RelativeLayout>
    </LinearLayout>
 </FrameLayout>
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="?android:attr/listPreferredItemHeight"
    android:orientation="horizontal"
    android:gravity="center_vertical"
    android:paddingRight="4px">
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:paddingLeft="6px">
        <TextView
            android:id="@+id/description"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textColor="?android:attr/textColorPrimary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />
        <TextView
            android:id="@+id/email"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorSecondary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />
    </LinearLayout>
    <View
        android:layout_height="fill_parent"
        android:layout_width="0px"
        android:layout_weight="1" />
    <TextView
        android:id="@+id/new_message_count"
        android:ellipsize="end"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:textColor="?android:attr/textColorPrimary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="@drawable/text_box_light"
        android:paddingLeft="10px"
        android:paddingRight="10px"
        android:minWidth="64px"
        android:gravity="right" />
 </LinearLayout>
--- a/res/layout/debug.xml
+++ b/res/layout/debug.xml
@ -0,0 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    >
    <TextView
    	android:id="@+id/version"
    	android:layout_width="fill_parent"
    	android:layout_height="wrap_content"
    	android:text="@string/debug_version_fmt"
    	/>
    <CheckBox
    	android:id="@+id/debug_logging"
    	android:layout_width="wrap_content"
    	android:layout_height="wrap_content"
    	android:text="@string/debug_enable_debug_logging_label"
    	/>
    <CheckBox
    	android:id="@+id/sensitive_logging"
    	android:layout_width="wrap_content"
    	android:layout_height="wrap_content"
    	android:text="@string/debug_enable_sensitive_logging_label"
    	/>
 </LinearLayout>	    
--- a/res/layout/folder_message_list_child.xml
+++ b/res/layout/folder_message_list_child.xml
@ -0,0 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="?android:attr/listPreferredItemHeight"
    android:paddingRight="10px"
    android:background="@drawable/folder_message_list_child_background">
    <View
        android:id="@+id/chip"
        android:background="@drawable/appointment_indicator_leftside_1"
        android:layout_width="4px"
        android:layout_height="56px"
        android:layout_centerVertical="true" />
    <TextView
        android:id="@+id/from"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_toRightOf="@id/chip"
        android:ellipsize="end"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?android:attr/textColorPrimary"
        android:paddingLeft="30px"
        android:drawablePadding="4px"
        android:paddingTop="12px" />
    <TextView
        android:id="@+id/date"
        android:ellipsize="end"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorPrimary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentRight="true"
        android:layout_alignBaseline="@+id/subject" />
    <TextView
        android:id="@+id/subject"
        android:ellipsize="end"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="?android:attr/textColorSecondary"
        android:layout_width="0dip"
        android:layout_height="wrap_content"
        android:layout_below="@id/from"
        android:layout_alignLeft="@id/from"
        android:layout_toLeftOf="@id/date"
        android:paddingLeft="30px"
        android:layout_marginRight="6dip" />
 </RelativeLayout>
--- a/res/layout/folder_message_list_child_footer.xml
+++ b/res/layout/folder_message_list_child_footer.xml
@ -0,0 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_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="10px"
        />
    <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>
--- a/res/layout/folder_message_list_group.xml
+++ b/res/layout/folder_message_list_group.xml
@ -0,0 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="?android:attr/listPreferredItemHeight"
    android:orientation="horizontal"
    android:gravity="center_vertical"
    android:paddingLeft="36px"
    android:paddingRight="4px">
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:gravity="center_vertical">
        <TextView
            android:id="@+id/folder_name"
            android:textAppearance="?android:attr/textAppearanceLarge"
            android:textColor="?android:attr/textColorPrimary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />
        <TextView
            android:id="@+id/folder_status"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="?android:attr/textColorTertiary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />
    </LinearLayout>
    <View
        android:layout_height="0dip"
        android:layout_width="0dip"
        android:layout_weight="1" />
    <TextView
        android:id="@+id/new_message_count"
        android:ellipsize="end"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:textColor="?android:attr/textColorPrimary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:background="@drawable/text_box_light"
        android:paddingLeft="10px"
        android:paddingRight="10px"
        android:minWidth="64px"
        android:gravity="right" />
 </LinearLayout>
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@ -0,0 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_height="fill_parent" android:layout_width="fill_parent"
    android:orientation="vertical" android:background="#ffffff">
    <ScrollView android:layout_width="fill_parent"
        android:layout_height="0dip" android:layout_weight="1"
        android:scrollbarStyle="outsideInset"
        android:fillViewport="true">
        <LinearLayout android:orientation="vertical"
            android:layout_width="fill_parent" android:layout_height="wrap_content">
            <LinearLayout android:orientation="vertical"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content" android:background="#ededed">
                <MultiAutoCompleteTextView
                    android:id="@+id/to" android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:textColor="?android:attr/textColorSecondaryInverse"
                    android:layout_marginLeft="6px"
                    android:layout_marginRight="6px"
                    android:hint="@string/message_compose_to_hint" />
                <MultiAutoCompleteTextView
                    android:id="@+id/cc" android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:textColor="?android:attr/textColorSecondaryInverse"
                    android:layout_marginLeft="6px"
                    android:layout_marginRight="6px"
                    android:hint="@string/message_compose_cc_hint"
                    android:visibility="gone" />
                <MultiAutoCompleteTextView
                    android:id="@+id/bcc" android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:textColor="?android:attr/textColorSecondaryInverse"
                    android:layout_marginLeft="6px"
                    android:layout_marginRight="6px"
                    android:hint="@string/message_compose_bcc_hint"
                    android:visibility="gone" />
                <EditText android:id="@+id/subject"
                    android:layout_width="fill_parent"
                    android:singleLine="true"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:textColor="?android:attr/textColorSecondaryInverse"
                    android:layout_marginLeft="6px"
                    android:layout_marginRight="6px"
                    android:hint="@string/message_compose_subject_hint"
                    android:autoText="true" android:capitalize="sentences" />
                <!--
                    Empty container for storing attachments. We'll stick
                    instances of message_compose_attachment.xml in here.
                -->
                <LinearLayout android:id="@+id/attachments"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical" />
                <View android:layout_width="fill_parent"
                    android:layout_height="1px"
                    android:background="@drawable/divider_horizontal_email" />
            </LinearLayout>
            <EditText android:id="@+id/message_content"
                android:textColor="?android:attr/textColorSecondaryInverse"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content"
                android:layout_weight="1.0"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:gravity="left|top"
                android:minLines="3" android:autoText="true"
                android:capitalize="sentences" />
        <!--  quoted text bar -->
            <RelativeLayout android:id="@+id/quoted_text_bar"
                android:layout_width="fill_parent"
                android:layout_height="45px" android:background="@drawable/email_quoted_bar">
                <TextView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:textColor="?android:attr/textColorSecondaryInverse"
                    android:text="@string/message_compose_quoted_text_label"
                    android:layout_alignParentLeft="true"
                    android:layout_centerVertical="true" />
                <ImageButton android:id="@+id/quoted_text_delete"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:background="@drawable/btn_dialog"
                    android:layout_centerVertical="true"
                    android:layout_alignParentRight="true" />
            </RelativeLayout>
            <WebView android:id="@+id/quoted_text"
                android:layout_height="wrap_content"
                android:layout_width="fill_parent" />
        </LinearLayout>
    </ScrollView>
    <LinearLayout android:orientation="horizontal"
        android:layout_width="fill_parent" android:layout_height="54px"
        android:background="@drawable/bottombar_565" android:gravity="center_vertical">
        <Button android:id="@+id/send" android:text="@string/send_action"
            android:layout_height="wrap_content" android:layout_width="0dip"
            android:layout_weight="1" />
        <Button android:id="@+id/save" android:text="@string/save_draft_action"
            android:layout_height="wrap_content" android:layout_width="0dip"
            android:layout_weight="1" />
        <Button android:id="@+id/discard" android:text="@string/discard_action"
            android:layout_height="wrap_content" android:layout_width="0dip"
            android:layout_weight="1" />
    </LinearLayout>
 </LinearLayout>
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@ -0,0 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="54px"
 	android:paddingRight="6px"
 	android:paddingTop="6px"
 	android:paddingBottom="6px">
 	<ImageButton
 		android:id="@+id/attachment_delete"
 		android:src="@drawable/ic_delete"
 		android:layout_alignParentRight="true"
 		android:layout_height="42px"
 		android:layout_width="42px" />
 	<TextView
 		android:id="@+id/attachment_name"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textColor="?android:attr/textColorSecondaryInverse"
 		android:layout_width="1dip"
 		android:layout_height="42px"
 		android:background="@drawable/text_box"
 		android:paddingLeft="36px"
 		android:singleLine="true"
 		android:ellipsize="start"
 		android:gravity="center_vertical"
 		android:layout_marginLeft="6px"
 		android:layout_marginRight="4px"
 		android:layout_alignParentLeft="true"
 		android:layout_toLeftOf="@id/attachment_delete" />
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:src="@drawable/ic_email_attachment"
 		android:layout_marginLeft="1px"
 		android:layout_centerVertical="true" />
 </RelativeLayout>
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@ -0,0 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="@android:color/white">
    <ScrollView
        android:layout_width="fill_parent"
        android:layout_height="0dip"
        android:layout_weight="1"
        android:scrollbarStyle="outsideInset"
        android:fadingEdge="none">
        <LinearLayout
            android:orientation="vertical"
            android:layout_width="fill_parent"
            android:layout_height="0dip"
            android:layout_weight="1">
            <RelativeLayout
                android:layout_width="fill_parent"
                android:layout_height="54px"
                android:paddingTop="4px">
                <Button
                    android:id="@+id/previous"
                    android:text="@string/message_view_prev_action"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:minWidth="@dimen/button_minWidth"
                    android:layout_alignParentLeft="true"
                    android:layout_centerVertical="true" />
                <Button
                    android:id="@+id/next"
                    android:text="@string/message_view_next_action"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:minWidth="@dimen/button_minWidth"
                    android:layout_alignParentRight="true"
                    android:layout_centerVertical="true" />
            </RelativeLayout>
            <include layout="@layout/message_view_header" />
        </LinearLayout>
    </ScrollView>
    <LinearLayout
        android:orientation="horizontal"
        android:layout_width="fill_parent"
        android:layout_height="57px"
        android:background="@drawable/ic_email_thread_open_bottom_default"
        android:gravity="center_vertical">
        <Button
            android:id="@+id/reply"
            android:text="@string/reply_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
        <Button
            android:id="@+id/reply_all"
            android:text="@string/reply_all_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
        <Button
            android:id="@+id/delete"
            android:text="@string/delete_action"
            android:layout_height="wrap_content"
            android:layout_width="0dip"
            android:layout_weight="1" />
    </LinearLayout>
 </LinearLayout>
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@ -0,0 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:paddingBottom="4px">
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:paddingLeft="4px">
        <RelativeLayout
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:background="@drawable/text_box"
            android:gravity="center_vertical">
            <ImageView
                android:id="@+id/attachment_icon"
                android:layout_width="62px"
                android:layout_height="62px"
                android:src="@drawable/attached_image_placeholder"
                android:layout_marginLeft="4px"
                android:layout_marginRight="4px"
                android:layout_marginBottom="4px"
                android:layout_marginTop="4px" />
            <TextView
                android:id="@+id/attachment_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="?android:attr/textColorSecondaryInverse"
                android:singleLine="true"
                android:ellipsize="middle"
                android:layout_alignParentTop="true"
                android:layout_toRightOf="@id/attachment_icon"
                android:layout_alignParentRight="true"
                android:layout_alignWithParentIfMissing="true" />
            <TextView
                android:id="@+id/attachment_info"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="?android:attr/textColorTertiaryInverse"
                android:singleLine="true"
                android:ellipsize="middle"
                android:layout_alignLeft="@id/attachment_name"
                android:layout_below="@id/attachment_name"
                android:layout_alignWithParentIfMissing="true" />
            <Button
                android:id="@+id/download"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                style="?android:attr/buttonStyleSmall"
                android:text="@string/message_view_attachment_download_action"
                android:singleLine="true"
                android:layout_alignParentRight="true"
                android:layout_below="@id/attachment_name"
                android:layout_marginTop="6px" />
            <Button
                android:id="@+id/view"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                style="?android:attr/buttonStyleSmall"
                android:text="@string/message_view_attachment_view_action"
                android:singleLine="true"
                android:layout_toLeftOf="@id/download"
                android:layout_alignWithParentIfMissing="true"
                android:layout_below="@id/attachment_name"
                android:layout_marginTop="6px" />
        </RelativeLayout>
    </LinearLayout>
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="fill_parent"
        android:layout_gravity="center_vertical">
        <ImageView
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:src="@drawable/ic_email_attachment"
            android:layout_alignParentLeft="true" />
    </LinearLayout>
 </FrameLayout>
--- a/Show More
+++ b/Show More