Commit Graph

7319 Commits

Author SHA1 Message Date
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
Andy Huang
b354794c21 hide text zoom pref in Email2
Bug: 5287963
Change-Id: I6661149a8e8a98d5cebb9ea0fcfe6b4bc7976ff7
2012-04-26 16:50:35 -07:00
Marc Blank
a4d8ff2293 Merge "Handle clearing notifications via respond()" into jb-dev 2012-04-26 15:27:21 -07:00
Eric Fischer
dda41f0339 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 14:11:52 -07:00
Marc Blank
c6297f8272 Handle clearing notifications via respond()
Bug: 6348210
Change-Id: I7040361123c86915d01e5b460f8c1f1e35f2a75b
2012-04-26 13:21:01 -07:00
Marc Blank
a5002464f1 Fix build
Change-Id: I2869b9e23dede6bd0217f55da0928374c7be5888
2012-04-26 12:33:59 -07:00
Eric Fischer
928d1352cf Import translations. DO NOT MERGE
Change-Id: I8bbc937076df8bd0045dfb289fdce6f6bea20a35
2012-04-26 12:01:59 -07:00
Marc Blank
03cd72805d Revert to old Email app
* These are the last sources in the ICS-MR1 tree

Change-Id: Ida4651bddd92a06a518d00f3e1f275ab3a80c8ae
2012-04-25 13:58:23 -07:00
Marc Blank
1f6dab6685 Don't allow sending from Combined account
Bug: 6319124
Change-Id: I0635bd59e2f53ce885e90f79be3611cebdb67f92
2012-04-24 11:56:06 -07:00
Marc Blank
b027bdadfa Make sure notifications run when app starts
Bug: 6346814

Change-Id: I1ddfe8b7fbc5225c1ada71c5211eb253a3952d77
2012-04-24 10:17:19 -07:00