Commit Graph

7378 Commits

Author SHA1 Message Date
Marc Blank
6fb157c90c Fix problem with empty content disposition
* And while we're at it, fix a repeating crash related to
  notifications.

Bug: 6561972
Change-Id: I44f2441bf7bfe4b364a605c0d7c8bae83229837a
2012-05-25 16:18:39 -07:00
Marc Blank
7c94a65c4a Merge "Support accountUri in Conversation cursor" into jb-ub-mail 2012-05-25 14:02:26 -07:00
Marc Blank
f4a1f8e6bd Support accountUri in Conversation cursor
Change-Id: Id1aa66df782a8ed1fb3d407a1d0a5f7b0eb5cf34
2012-05-25 13:51:32 -07:00
Paul Westbrook
b084f6409a New notifications for Email2
Merges the following changes into jb-ub-mail

https://android-git.corp.google.com/g/191855
https://android-git.corp.google.com/g/191887
https://android-git.corp.google.com/g/192597

Change-Id: I34d927952b6a80fdd454a0f174711e0e4c740502
2012-05-25 13:01:28 -07:00
Marc Blank
28d2fb96f1 Don't allow undo for deletions in trash
Bug: 6282899
Change-Id: I23d0c768a71e08d493f42ee2c8b08ae95dbc1cf4
2012-05-25 10:50:23 -07:00
Marc Blank
d4937049b2 Notify widgets when mailbox contents change
Bug: 6309668
Change-Id: Ibc7fff796f454e1ae4fc56a0a9282021865b4fc9
2012-05-23 13:37:33 -07:00
Marc Blank
2a5ea1af54 Manually merge change from jb-dev
Bug: 6479301
Change-Id: I7c2bce9920ede3b03f60c5bf7d02a9152c84941e
2012-05-22 11:40:06 -07:00
Marc Blank
9037a64ead Make viewables handling more sensible in MimeUtility
* We had some relatively complicated rules for what was "viewable",
  but there are cases missed.
* It's simplest to consider all non-attachment images and text as
  viewable.

Bug: 6524411
Change-Id: I57844916af4ded683e69932b4effd5546ec42ad2
2012-05-21 13:01:46 -07:00
Marc Blank
0d296a66d8 Port new EmailClientConfigurationManager code from jb-dev
Change-Id: Ibb07415a2b78e6160999d44b21ccd24406447f88
2012-05-21 09:52:19 -07:00
Marc Blank
323eea8ac8 Don't use a repeating alarm for AttachmentDownloadService
* Guarantees we can't have runaway alarms
* Manually merged from Email1

Bug: 6494254
Change-Id: I7f272f650ab34d50ec71ad503951ada3bbf203af
2012-05-18 14:09:46 -07:00
Paul Westbrook
671965f494 Merge "Build against the JB SDK" into jb-ub-mail 2012-05-17 17:09:08 -07:00
Paul Westbrook
1f639e958e Build against the JB SDK
Change-Id: Ibc4208f26870545aaacebd3dc36fdd56a904d90e
2012-05-17 16:37:42 -07:00
Marc Blank
168dec146f Add account color to account spinner
* For combined view

Bug: 6281321
2012-05-17 15:15:28 -07:00
Marc Blank
def815811a Merge "Update jb-dev to jb-ub-mail" into jb-ub-mail 2012-05-16 16:26:17 -07:00
Marc Blank
d10022e4da Update jb-dev to jb-ub-mail 2012-05-16 16:23:34 -07:00
Mindy Pereira
2d804a12ff Merge "Remove Email2 overrides. Use UnifiedEmail styling." into jb-ub-mail 2012-05-16 15:13:24 -07:00
Mindy Pereira
160df820fa Remove Email2 overrides. Use UnifiedEmail styling.
Change-Id: I40b138f58464678a98854902b976581b7210fa7b
2012-05-16 15:08:32 -07:00
Eric Fischer
f8f97bb1ef Import translations. DO NOT MERGE
Change-Id: Ifcfb1289a255ed007a09e25a3a18a4cab73f1bb3
2012-05-15 15:52:33 -07:00
Eric Fischer
3b6f470ef2 Import translations. DO NOT MERGE
Change-Id: Iad8ed5cfdad8c8cc39c8bc5f7558c5d243fe1e43
2012-05-14 11:50:19 -07:00
Eric Fischer
ca1c8af924 Import translations. DO NOT MERGE
Change-Id: I7d6d234de4be71a35d293b0bdf641c3bfcbda665
2012-05-11 12:34:38 -07:00
Marc Blank
40f3516047 Merge "Add account color to message list for combined account" into jb-ub-mail 2012-05-08 14:14:19 -07:00
Marc Blank
84da65d222 Add account color to message list for combined account
Change-Id: I284179feadac4bdd1677c33c5be3f00e865c1430
2012-05-08 14:09:21 -07:00
Eric Fischer
70ffb20e42 Import translations. DO NOT MERGE
Change-Id: If541398f08ee734121888998f67ce237c8b309d0
2012-05-08 11:38:24 -07:00
Eric Fischer
cbed5b6498 Import translations. DO NOT MERGE
Change-Id: I7e96d1b90b63972397cea17026d55816bde670f5
2012-05-07 11:32:01 -07:00
Eric Fischer
6ad51ff2cc Import translations. DO NOT MERGE
Change-Id: I4103ff42285f6e591e26aa25457ea7a3766951d8
2012-05-03 13:15:20 -07:00
Eric Fischer
f3a27fec56 Import translations. DO NOT MERGE
Change-Id: I3a0a145ea84893c83d0d2a887c16faac2480a903
2012-05-02 11:37:25 -07:00
Marc Blank
d534b58f47 Merge "Compatibility upgrade from Email1 to Email2" into jb-ub-mail 2012-05-01 13:29:39 -07:00
Eric Fischer
d6d845eccd Import translations. DO NOT MERGE
Change-Id: If1463107c3a557b18b2618cf1086c7eb14ce0b30
2012-05-01 10:55:58 -07:00
Marc Blank
270ed83636 Compatibility upgrade from Email1 to Email2
Change-Id: I6554c91b1078c266183629e0a366bc4b4ac68d7f
2012-05-01 09:29:42 -07:00
Eric Fischer
c893af4fa0 Import translations. DO NOT MERGE
Change-Id: I438e659c5c497290a252734eae810bdeb2dd08a2
2012-04-30 11:12:28 -07:00
Marc Blank
9f2e3b7179 Merge "Rework reply/forward to use unified-style data" into jb-ub-mail 2012-04-30 08:47:17 -07:00
Marc Blank
afb34d19ee Rework reply/forward to use unified-style data
* Deprecate fields no longer used in Body table

Bug: 6393061

Change-Id: I48f41063667f6edef43756b16acdfd1e65ef554c
2012-04-30 08:38:47 -07:00
Marc Blank
c75cd15c96 Use "Inbox" rather than "INBOX" for, well, "inbox"
Bug: 6366703
Change-Id: If9a43513990802203431ecbbcd96247b2db8e93f
2012-04-29 20:14:48 -07:00
Paul Westbrook
6a7d10e1c3 Merge 'goog/jb-dev' into 'goog/jb-ub-mail'
Change-Id: I29ca31c2ec3b773a484e8c3b3880057852479125
2012-04-27 15:01:08 -07:00
Marc Blank
f05dba090c Merge "Add quoted text start pos to Body table" into jb-dev 2012-04-27 13:54:55 -07:00
Marc Blank
c6f104f2a7 Add quoted text start pos to Body table
Change-Id: Ie80fbb686382a8d38ea09d05b4757a82169be3fc
2012-04-27 13:37:56 -07:00
Paul Westbrook
f402687b72 Merge "Build against the ICS SDK" into jb-ub-mail 2012-04-27 13:29:28 -07:00
Paul Westbrook
7a7508c641 Build against the ICS SDK
Change-Id: Ib6429d43420b1382c8dfc81d30568c62cbbf92b6
2012-04-27 12:40:13 -07:00
Eric Fischer
9fd8864433 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-27 11:10:39 -07:00
Eric Fischer
ee56777b06 Import translations. DO NOT MERGE
Change-Id: I4075aac1b807ef02400b8c1d517ea14f1b7517a6
2012-04-27 11:06:24 -07:00
Eric Fischer
bd9e17a072 Import translations. DO NOT MERGE
Change-Id: If4b740adde8044002746e4df539200f999a47bad
2012-04-27 11:05:20 -07:00
Marc Blank
d053465149 Have "view in calendar" directly open the event if possible
Bug: 5011918
Change-Id: I872ca6b78af08092017aa02810a07497a82758c1
2012-04-27 10:05:52 -07:00
Marc Blank
5ac4978680 Merge "Add preliminary support for viewing events" into jb-dev 2012-04-27 09:36:11 -07:00
Marc Blank
c8ae6156da Merge "Make sure all drafts are "read"" into jb-dev 2012-04-27 09:21:45 -07:00
Marc Blank
597cfcf7ce Add preliminary support for viewing events
Bug: 5011918

Change-Id: I573ed44b09f5e695d04fd081ea8af221fb396d94
2012-04-27 09:07:40 -07:00
Marc Blank
31a5e5c58d Make sure all drafts are "read"
Bug: 6408601
Change-Id: I99dc9a1f017d67474540c07a76d11ec33c0ec3d8
2012-04-26 23:24:37 -07:00
Marc Blank
b3cf559736 Merge "Confirm calendar invite response, and delete message" into jb-dev 2012-04-26 20:41:47 -07:00
Paul Westbrook
d658fb6cac Set clear_when_task_reset flag on get content intent
Bug: 6401627
Change-Id: I546d51e605bf9483bd36f56adf5b21c1b3cd4c70
2012-04-26 18:48:08 -07:00
Paul Westbrook
65432baf25 set FLAG_ACTIVITY_TASK_ON_HOME on notification intent
Bug: 6384825
Change-Id: I9fc577ab3acdc608ce6e1781d438cc049c6ddcd6
2012-04-26 18:26:57 -07:00
Marc Blank
519196dcf9 Confirm calendar invite response, and delete message
* Also, make sure that deletions update totals
* And that undo does the same

Bug: 6399958

Change-Id: I0250c34ce2515327f2a5bffec0cd059af9cefac4
2012-04-26 17:45:45 -07:00