Andrew Sapperstein
bebb152ce0
Merge "Update to email2 for the new spam warnings." into jb-ub-mail
2012-07-12 16:47:21 -07:00
Andrew Sapperstein
de79ecbbe2
Update to email2 for the new spam warnings.
...
This feature being Gmail-specific, we simply
set the default values so that warnings never show
up for email clients.
Change-Id: Ie0a55762c1af73a9c9aa8836faadc23ac9af52cb
2012-07-12 15:08:09 -07:00
Ying Wang
bbc357980d
Import translations. DO NOT MERGE
...
Change-Id: Ib5be7b82086eacdb7dcc59a1c486f8d657df4bc9
Auto-generated-cl: translation import
2012-07-12 10:56:15 -07:00
Paul Westbrook
f4f33fd2a9
Change version code & name
...
Change-Id: Id02ef972a59fbc648acacf07f0fe69356ed3587a
2012-07-11 16:02:18 -07:00
Mindy Pereira
d53f15d842
Merge "Disable compose until an account has synced." into jb-ub-mail
2012-07-11 15:13:28 -07:00
Mindy Pereira
17fa1af8df
Disable compose until an account has synced.
...
Change-Id: Icac997bc7137ec7123d469320b1b204ee9e385bc
2012-07-11 14:56:30 -07:00
Ying Wang
4a06a74262
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-07-11 11:34:15 -07:00
Ying Wang
1a9d92d098
Import translations. DO NOT MERGE
...
Change-Id: Ie83defc3105db4d40324eebe80e2a80179844af2
Auto-generated-cl: translation import
2012-07-11 11:22:29 -07:00
Ying Wang
428e0b9630
Import translations. DO NOT MERGE
...
Change-Id: If882fa6b3038534648628e52b11bea2cdc8bd6f8
Auto-generated-cl: translation import
2012-07-11 10:40:17 -07:00
Marc Blank
4789524401
Merge "Fix local builds w/ CleanSpec" into jb-ub-mail
2012-07-09 16:27:51 -07:00
Marc Blank
b3db4d8955
Fix local builds w/ CleanSpec
...
Change-Id: I4f9ec7e794ad05ca4adea0bb6a318c17a60d71eb
2012-07-09 16:26:41 -07:00
Ying Wang
d12c1ce9a0
Import translations. DO NOT MERGE
...
Change-Id: Ic9ac9dcb6408b1368355f3c6390ee584540c77f4
Auto-generated-cl: translation import
2012-07-03 11:14:46 -07:00
Ying Wang
22efbc3800
Import translations. DO NOT MERGE
...
Change-Id: I6bd525f3effcd4696974667b58b2f1a6f9227fa3
Auto-generated-cl: translation import
2012-06-29 10:42:30 -07:00
Marc Blank
8bc654a3e5
Remove last stragglers from email2
...
Change-Id: I640ff448242ffc0d6c7ad50480e16ab88ba55f22
2012-06-29 09:09:11 -07:00
Marc Blank
7c8f1c125a
Fix handling of json in SQLite query
...
Bug: 6749576
Change-Id: I3cd85182d8c35e564f50ee7f9c787d797253e105
2012-06-28 13:09:13 -07:00
Marc Blank
c5afb16430
Add a bunch of stuff missed earlier
...
Change-Id: I7f707446a963912fe5786dacb5569e68db572d1c
2012-06-28 12:16:59 -07:00
Marc Blank
f419287f22
DO NOT MERGE: Move emailcommon2 sources to emailcommon
...
Change-Id: I06df7e467cd2e0117df8b8db3ddc6ff9da13f1c7
2012-06-28 11:15:06 -07:00
Mindy Pereira
1c9d351b64
Merge "Fixup position of folder icon/ folder name." into jb-ub-mail
2012-06-28 10:55:58 -07:00
Mindy Pereira
5dcb4adf2d
Fixup position of folder icon/ folder name.
...
Change-Id: I24b5ca12a72eeb092c7a0c0b4d93c5613f9b3c43
2012-06-28 10:51:37 -07:00
Eric Fischer
d78cc9c6d1
Import translations. DO NOT MERGE
...
Change-Id: Ic5bc26e77047bb54ee99bc089875e415d8d2d57c
Auto-generated-cl: translation import
2012-06-28 10:37:05 -07:00
Marc Blank
b840b395a8
Fix problem w/ IMAP attachments and connections
...
Bug: 6743762
Change-Id: I08d27c1bf919c499e87a226004e79ceba2db6df0
2012-06-27 16:12:59 -07:00
Ying Wang
738ea8ca46
Import translations. DO NOT MERGE
...
Change-Id: Id7a7e3345e34d67f419b004f14b7aef52d443ab8
2012-06-27 12:23:03 -07:00
Mindy Pereira
ed9bb52b96
Remove folder_item.xml
...
Just use the one in unifiedemail
Change-Id: Ifa2c0f207fc758a8b13c03bb9fcaa2446c8b7469
2012-06-27 09:29:22 -07:00
Marc Blank
ebd249b0a3
Merge "Support the "all folders" query from UIProvider" into jb-ub-mail
2012-06-26 16:15:07 -07:00
Marc Blank
e17f0dcf3a
Support the "all folders" query from UIProvider
...
Change-Id: Ib5415c5505fc10204c3a3773efae89528fb44c28
2012-06-26 16:09:46 -07:00
Marc Blank
494e02ae2d
Add hierarchicalName to Mailbox table and class
...
Change-Id: Icc90761f122cb24c7d1eb91820a2f00b0116e89e
2012-06-26 13:20:40 -07:00
Marc Blank
78ffc31aa5
Merge " Move guts of ExchangeService to emailsync static lib" into jb-ub-mail
2012-06-25 18:05:25 -07:00
Marc Blank
ece21ccb20
Move guts of ExchangeService to emailsync static lib
...
* We move most of the sync logic into a new emailsync static lib that
Exchange can use (and push IMAP eventually as well)
Change-Id: Ia1ed4a0f4e385f5e3d389ff66dad21f5e4a8eb2e
2012-06-25 14:55:53 -07:00
Paul Westbrook
cc3fb1dc68
Logutils changes
...
Allow Email to override the log tag for UnifiedEmail code
Change-Id: I4de991371cc80704c6f4c2198d7d121f22c16f48
2012-06-25 14:47:47 -07:00
Andrew Sapperstein
bf50424033
Merge "Removing the photo viewer from email2." into jb-ub-mail
2012-06-25 12:04:51 -07:00
Eric Fischer
7f54adb09f
Import translations. DO NOT MERGE
...
Change-Id: Ie3e0d5bd7500bd0546ffa6c2c5394b4bd43e5ff2
2012-06-25 10:36:14 -07:00
Andrew Sapperstein
94299b9f85
Removing the photo viewer from email2.
...
Change-Id: Idfdf1e225bef2a7820fd648bc25cb1ee4210e601
2012-06-22 16:24:45 -07:00
Ying Wang
7f8a7f69bb
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-06-22 12:23:31 -07:00
Marc Blank
9218bd8c88
Try to handle IMAP/POP mime types better
...
* When we get a "generic" type, try to infer a better one from
the filename extension (as Exchange already does)
* Also, remove unused method
Bug: 6713335
Change-Id: I540a92aabd13bc1d30ce1838129a86f5eaf3564e
2012-06-22 11:38:33 -07:00
Ying Wang
e508a7b624
Import translations. DO NOT MERGE
...
Change-Id: If08ea734eef27eececf052d66c7189b39b9bf041
2012-06-22 11:28:28 -07:00
Marc Blank
1d229f54bf
Fix failing permission check in AttachmentProvider
...
* Now that we're using a Service to process attachment calls, we
need to be calling checkCallingOrSelfPermission instead of
checkCallingPermission
* Thanks, Dianne!
Change-Id: Icf5d16009259820e9cdf5855aedd9dac8814aa61
2012-06-22 10:51:00 -07:00
Andrew Sapperstein
1138c799d6
Using absolute pkg name for MailPhotoViewActivity.
...
Change-Id: I987e10c774ced54673143c74e774ecd8fdce91cf
2012-06-21 15:59:09 -07:00
Andrew Sapperstein
d638e701c4
Adding MailPhotoViewActivity to email2 manifest.
...
So it'll actually open the photo viewer in Email2.
Change-Id: Ia4f5ce69367c88c5b9dbb546da44f55aa93205be
2012-06-21 14:30:28 -07:00
Eric Fischer
a4d7a3d0a9
Merge "Import translations. DO NOT MERGE" into jb-ub-mail
2012-06-21 11:42:06 -07:00
Eric Fischer
fa073ff95b
Import translations. DO NOT MERGE
...
Change-Id: I26a2c9eccf1d4096d822615e1ea714d2f18bb293
2012-06-21 11:33:25 -07:00
Marc Blank
8ef319cc3f
Cleanup of services.xml
...
* Document service attributes
* Turn magic numbers into enums
* Remove unused attribute
Change-Id: I463c64c5c9f589946dc9e27b4f630170ac46bafc
2012-06-21 11:27:54 -07:00
Marc Blank
43b0f13200
Oops; fix IMAP port
...
Change-Id: Iab7d3878d4011becbabd737370bfe42d155b6b5e
2012-06-21 10:34:48 -07:00
Marc Blank
a8b23f2b43
Merge "Setup port from services.xml when autoconfiguring" into jb-ub-mail
2012-06-21 09:56:40 -07:00
Marc Blank
556af6cfcb
Setup port from services.xml when autoconfiguring
...
Change-Id: Iec2d3fddb345b57ba84a794d9e92cad7a631c105
2012-06-21 09:50:30 -07:00
Eric Fischer
627996ca84
Import translations. DO NOT MERGE
...
Change-Id: I0308a2f8aa11319a8cc1673c1bc0f82250e96794
2012-06-20 19:04:29 -07:00
Marc Blank
cb9035a87d
Remove final protocol references in non-sync code
...
* Generalize debug settings
* Generalize setup from account manager (Settings)
* Remove unused protocol code
Change-Id: I7f49384058c1a2105936a85d4bace2c771e201ec
2012-06-20 16:57:37 -07:00
Marc Blank
161d73491d
Merge "Add logging for AccountSecurity class" into jb-ub-mail
2012-06-20 13:10:41 -07:00
Marc Blank
54eb1f2286
Add logging for AccountSecurity class
...
* Temporary, for debugging
Change-Id: Ia3798333c7f19bfdea0b19b3c85e0519a1daa8c3
2012-06-20 12:50:35 -07:00
Marc Blank
a9bee2c81f
Gracefully handle case of null/non-existent protocols
...
Change-Id: I3be50b9e2b992cebf64fdeeb13b63a241ec31a52
2012-06-20 12:18:38 -07:00
Marc Blank
58d0db2709
Prevent NPE getting non-existent mailbox
...
Change-Id: I0c0bbc64a9b9871344ae5704f9d098073a1d425d
2012-06-20 09:55:32 -07:00