Commit Graph

6933 Commits

Author SHA1 Message Date
Mindy Pereira
c65aaacff1 Merge "Define reply state in this overlay." 2012-03-14 16:27:47 -07:00
Mindy Pereira
b6f1d718db Define reply state in this overlay.
By default, it is not included in the conversation item layout.
The drawables have been moved to unifiedemail.
Change-Id: I2c9cecb8cda32db104ced2d3273327c1096155e9
2012-03-14 16:21:55 -07:00
Marc Blank
b58523bcd0 Merge "Copy Email proguard.flags to email2; add UnifiedEmail flags" 2012-03-14 13:51:19 -07:00
Marc Blank
3378017380 Copy Email proguard.flags to email2; add UnifiedEmail flags
Change-Id: Ifdea7cc1ae2f495be3ab4fab86279962b2088d94
2012-03-14 12:10:39 -07:00
Eric Fischer
9bd07c513f Import translations. DO NOT MERGE
Change-Id: I71d5f7b5f51e227165df2fc6f3b4b09ee06b28bf
2012-03-14 11:51:23 -07:00
Marc Blank
d4882f6948 Merge email source into email2
Change-Id: I68d5290663386b00b02c7b7488ee4f5177aa504d
2012-03-13 19:10:29 -07:00
Mindy Pereira
a7d788d54a Fix build.
Change-Id: I077de029e1da06e3dcd6dae438a6c64b58e9e127
2012-03-13 16:12:51 -07:00
Mindy Pereira
4bf4edcf64 Send uri of folder this item is in instead of just the id.
Change-Id: I5b7ba10497ac2f5081de02074d525e39d73ba9b0
2012-03-13 16:04:44 -07:00
Paul Westbrook
1d202e274d Support new folder id
Change-Id: If971ca60e5029487dd1c12b4664c6b64f3133f4a
2012-03-13 14:06:03 -07:00
Eric Fischer
03d1f7b8fa Import translations. DO NOT MERGE
Change-Id: Ia9eeb643c49acadcf6610108bc0e382650ba4e77
2012-03-13 12:32:48 -07:00
Marc Blank
ebbf8e1040 Merge "Add support for "Load more" for search results" 2012-03-12 17:19:06 -07:00
Marc Blank
6550ae9773 Add support for "Load more" for search results
Change-Id: Ie16e11ced34c85de02980c85e2db9d61faed5b6f
2012-03-12 17:11:19 -07:00
Paul Westbrook
b4c5ba963a Change Email2's build
Now Email2 is not being built as an override package, and
the package is not being renamed

Change-Id: I2f7b08165cef19c24084942f4ee11c8d401a2ca8
2012-03-12 13:39:00 -07:00
Andy Huang
dd32d14187 cross-project refactoring
Attachment.mimeType -> contentType
Attachment.contentUri(String) -> contentUri(Uri)

Change-Id: Id35fb698d120013c00878f416f9b68a2f0095fca
2012-03-12 13:31:33 -07:00
Mindy Pereira
55f875a08f Merge "Listen for the correct data update intent." 2012-03-12 13:15:54 -07:00
Mindy Pereira
ef337e074a Listen for the correct data update intent.
This is one of the reasons we weren't getting widget updates.

Change-Id: Ie205fb72b1d2bf646d290b6c1900c15c89ff6de6
2012-03-12 13:11:52 -07:00
Eric Fischer
cba5a03825 Import translations. DO NOT MERGE
Change-Id: Id2cadfb3d46977b2a076978e9c487495ebc45d36
2012-03-12 12:13:58 -07:00
Marc Blank
34943d241d Trigger load of full msg when opening partially loaded msg
Change-Id: Ia49aa7f423ceac6697d95abf66e10bb5998c5747
2012-03-12 10:37:19 -07:00
Marc Blank
824f776365 Fix up load of IMAP attachments
Change-Id: I2f55fc2c3d92eff72ebfd50ff3f782928f3a85a2
2012-03-12 09:11:46 -07:00
Marc Blank
e2166f7548 Add totalCount to Mailbox; send to UIProvider
Change-Id: If01868eb27a97540683f25148f32b8c41ae59c17
2012-03-10 20:15:58 -08:00
Marc Blank
9e266d12fb Implement "load more" for POP/IMAP
* Search not yet implemented

Change-Id: Ic808d3adcb48a2b4370fda77d7b108ea656de5c4
2012-03-10 15:41:43 -08:00
Marc Blank
25fe72687d Notify on attachment's message when updates occur
Change-Id: I23d537992fbf8b0f0dab3afaf37cacfd5587d1f3
2012-03-09 15:33:39 -08:00
Marc Blank
3c3db16a06 Merge "Report search result total to UI" 2012-03-09 14:07:58 -08:00
Marc Blank
8100a6716c Merge "Move account delete logic to EmailProvider" 2012-03-09 14:07:22 -08:00
Marc Blank
55d0e821ea Report search result total to UI
Change-Id: Ic88e7594b98548a96c8c6f96d2f8a585e539f520
2012-03-09 14:04:49 -08:00
Marc Blank
ebb79619e8 Move account delete logic to EmailProvider
* This functionality had to move away from Controller

Change-Id: I557918a325eab8c83a9728fa1ce33dde8b86158f
2012-03-09 12:59:21 -08:00
Eric Fischer
d2c105e13f Import translations. DO NOT MERGE
Change-Id: Idebec4356e561ecf8e118e5fd2816e08bb46af5c
2012-03-09 11:02:56 -08:00
Marc Blank
ab6321e2c4 Fix SMTP sending
Bug: 6134036
Change-Id: Id48e4bd17e7493d873d888027e68c7eb86d23198
2012-03-09 10:26:33 -08:00
Marc Blank
f0ba2d41ca Merge "Use proper column in loadAttachmentCallback" 2012-03-08 22:59:38 -08:00
Marc Blank
3408ad1113 Use proper column in loadAttachmentCallback
Bug: 6138389

Change-Id: Icd9b3454670d29e1fbd1dfc309700eb1643cc9ee
2012-03-08 21:18:04 -08:00
Marc Blank
ddca5c8848 Add permission for attachment reading
Change-Id: I50224b5feb6772700a673bd20c27c8711d09d59f
2012-03-08 20:04:17 -08:00
Marc Blank
97e4651c45 Repair brain damage
Change-Id: I1f2367476f78c5cd78d8a59e099debabceb95e3a
2012-03-08 19:48:11 -08:00
Marc Blank
c3643cf2b5 Fix search to work with IMAP
Change-Id: Ic3d9dfec0e30323e258e59630c2ca42bb1c7e98c
2012-03-08 17:23:49 -08:00
Marc Blank
26195ef64d Handle searchUri (first pass)
Change-Id: I75f7a757322e1d4f9b4eac92b9ecbb6a0cc6580b
2012-03-08 15:14:48 -08:00
Marc Blank
e1195f97d2 Merge "Fix up delete to handle trash/drafts deletions" 2012-03-08 15:12:06 -08:00
Marc Blank
06a382f26f Fix up delete to handle trash/drafts deletions
* Also, while we're here, create default "last touched time" for drafts and
  sent so that they appear in the initial recent list

Change-Id: Ie2fe20b34625b5616dac5581f9bbd015f52a82bc
2012-03-08 14:36:26 -08:00
Eric Fischer
194338f915 Merge "Import translations. DO NOT MERGE" 2012-03-08 11:10:33 -08:00
Eric Fischer
af99847e39 Import translations. DO NOT MERGE
Change-Id: I11d56ddc18a2a49ebfb47bc51959c285df7076bc
2012-03-08 11:08:54 -08:00
Mindy Pereira
64192ef8e8 Merge "Connect search activities for email2." 2012-03-08 10:37:30 -08:00
Mindy Pereira
d27eed969b Connect search activities for email2.
Change-Id: I9462e2a99dc9c37b7a14b9bcc4e3b44c227c131f
2012-03-08 10:17:55 -08:00
Marc Blank
92f9de3c5c Merge "Return searchUri with accounts; return empty cursor for now" 2012-03-08 08:21:54 -08:00
Marc Blank
ef94d9285e Return searchUri with accounts; return empty cursor for now
Change-Id: I160676a492ef359007676c3aa9f56f9015b64c64
2012-03-08 08:17:52 -08:00
Brian Muramatsu
6b4cdee94f am 938ec79a: am d163332b: am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit '938ec79ac92ef9119ad75b49691b2121886d867b':
  Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 17:22:07 -08:00
Marc Blank
420e97f0f8 Support attachment commands from UIProvider
Change-Id: Ib457808bdb424275c0abe6e1d86e3b9d33406780
2012-03-07 14:57:19 -08:00
Marc Blank
95bc0d0fee Merge "Add columns to Attachment for UIProvider use" 2012-03-07 13:16:55 -08:00
Marc Blank
70bbe5ec3c Add columns to Attachment for UIProvider use
Change-Id: I7f85431f409dbd6a5bd6d111b18d1fc89c00b9b2
2012-03-07 13:10:23 -08:00
Eric Fischer
fc395fbeef Import translations. DO NOT MERGE
Change-Id: If90878326bff24f70a26e6944d763f669d8b36e0
2012-03-07 11:33:24 -08:00
Andy Huang
b4a4ca99a9 Attachment SYNCED column is going away
Change-Id: I19476bc5a9a9e557e61a7347689129ce552b3ff9
2012-03-07 10:29:23 -08:00
Marc Blank
af8f8a48ee Reconcile accounts in deleteAccountPIMData
Change-Id: Ifd17ef76e13ddcfa07c84429dca7bf19e6cbcfab
2012-03-07 08:43:08 -08:00
Brian Muramatsu
938ec79ac9 am d163332b: am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit 'd163332bc58cb1b2f09fd061e51e50ecbc40eb73':
  Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 02:13:25 -08:00