The Android Automerger
bdf451528c
merge in ub-mail-master-release history after reset to 3f553c4729
2014-06-02 20:00:11 -07:00
Alan Lau
3f553c4729
am 07e0bf5c: (-s ours) DO NOT MERGE Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
...
* commit '07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d':
DO NOT MERGE Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-06-02 17:47:50 +00:00
Alan Lau
07e0bf5c74
DO NOT MERGE Adding data to the pending intent for notification action. This is now needed
...
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.
Bug 15344221
Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
(cherry picked from commit 10d73dbe18
2014-06-02 17:17:23 +00:00
Alan Lau
3355e58f56
am 10d73dbe: Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
...
* commit '10d73dbe18873bbea41608072544e251cb89d85c':
Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-05-31 02:18:57 +00:00
James Lemieux
a8c8a745a8
Merge ""No quick responses available" should display when all quick responses are deleted" into ub-mail-master
2014-05-30 22:46:22 +00:00
Martin Hibdon
a6e65290be
Merge "Change IEmailService.sync to have two different forms" into ub-mail-master
2014-05-30 22:15:54 +00:00
Anthony Lee
e8cdcc7250
Merge "Cleanup of AttachmentService code and enabling of DownloadQueue." into ub-mail-master
2014-05-30 22:06:49 +00:00
Alan Lau
10d73dbe18
Adding data to the pending intent for notification action. This is now needed
...
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.
Bug 15344221
Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
2014-05-30 14:50:33 -07:00
Martin Hibdon
163323294e
Change IEmailService.sync to have two different forms
...
Change-Id: Id8e770154d6116b02746cbdfb8c7cdc9358398de
2014-05-30 14:49:47 -07:00
James Lemieux
6dce0b1819
"No quick responses available" should display when all quick responses are deleted
...
b/14239989
We take advantage of ListView's feature that displays an entirely different
view in place when the backing Adapter is empty. The empty view is simply a
TextView displaying "No quick responses available".
Change-Id: I244ffd21fc4c1557c73979d4bb7c99306b11ebb2
2014-05-30 14:49:05 -07:00
Anthony Lee
e33511699a
Cleanup of AttachmentService code and enabling of DownloadQueue.
...
Removed unused functions, 'final'ed variables and parameters,
revisited some thread synchronization. Effectively no new code
introduced so no unit tests for this CL.
Change-Id: I714724a98d31a231ab10b0ad468b8efaa460bd1d
2014-05-30 13:26:08 -07:00
Baligh Uddin
497553627c
am 938c6ffa: (-s ours) am d1b549dc: (-s ours) Import translations. DO NOT MERGE
...
* commit '938c6ffa9ba4d2db84d4cea5e0409627f31be231':
Import translations. DO NOT MERGE
2014-05-30 02:53:56 +00:00
Baligh Uddin
938c6ffa9b
am d1b549dc: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd1b549dc14e4f26121ebaff435f7cfd62061b303':
Import translations. DO NOT MERGE
2014-05-30 02:52:13 +00:00
Baligh Uddin
d1b549dc14
Import translations. DO NOT MERGE
...
Change-Id: Ie565f9a9be1a75e2afda530a48c03875e4c151f7
Auto-generated-cl: translation import
2014-05-29 19:45:22 -07:00
Martin Hibdon
13d3a42d94
am 636a20a7: Bump version number
...
* commit '636a20a7276fd28f1ac682d10bf343161a1c5bc6':
Bump version number
2014-05-29 20:42:58 +00:00
Martin Hibdon
636a20a727
Bump version number
...
Change-Id: I2831b14d1e6a612f05caf285aaa1253e757f0890
2014-05-29 13:40:37 -07:00
Andrew Sapperstein
970b4b7eb2
am 4e6aa252: Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
...
* commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce':
Support hooks for new contact photo source.
2014-05-28 19:41:13 +00:00
Andrew Sapperstein
4e6aa25286
Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
2014-05-28 19:38:41 +00:00
Jay Shrauner
f3440d33a9
Fix NPE in setAccountPolicy
...
Check for null returned by Account.restoreAccountWithId as with other places
where it is called.
Bug:15286267
Change-Id: I56d59564a1fa814f5c52b44c12303014eea2b0b0
2014-05-27 14:05:56 -07:00
The Android Automerger
8af82f1282
merge in ub-mail-master-release history after reset to 4ce1fc7669
2014-05-26 20:00:11 -07:00
Tony Mantler
4ce1fc7669
Disambiguate settings intents
...
b/13325901
Change-Id: I2843a6bfdac4acbabc758ddc44f1d980b7036aef
2014-05-22 14:31:22 -07:00
Tony Mantler
8b801e915c
Fix AOSP Email compile
...
Change-Id: Ic894b2c0534e09bf42662c49855fda39967958eb
2014-05-22 13:16:38 -07:00
Martin Hibdon
92a059ece4
Merge "Revert "Get rid of deleteAccountPIMData from IEmailService"" into ub-mail-master
2014-05-21 20:43:10 +00:00
Martin Hibdon
c5f5a14ae9
Revert "Get rid of deleteAccountPIMData from IEmailService"
...
This reverts commit cf2178c4fa
2014-05-21 20:41:37 +00:00
Martin Hibdon
9598c1e817
Merge "Get rid of deleteAccountPIMData from IEmailService" into ub-mail-master
2014-05-21 20:31:08 +00:00
James Lemieux
332f544991
Merge "Sanitize HTML email bodies in Android Email" into ub-mail-master
2014-05-21 20:12:06 +00:00
Martin Hibdon
cf2178c4fa
Get rid of deleteAccountPIMData from IEmailService
...
This doesn't need to be part of the service because the
implementation doesn't need to be different between any
of the different protocols.
Change-Id: Ifddf16dd3ccaf397029f08f6d4283d9a5630f717
2014-05-21 12:18:29 -07:00
Tony Mantler
44d3500f7a
Merge "Remove unused constant" into ub-mail-master
2014-05-21 17:53:04 +00:00
Tony Mantler
5021265826
Merge "Test encode/decode of attachments" into ub-mail-master
2014-05-21 17:48:53 +00:00
Tony Mantler
4abb30384f
Remove unused constant
...
b/15133133
Change-Id: Ia89829e796dadf48f0257adb994c7102b7d30baf
2014-05-21 10:33:15 -07:00
Tony Mantler
5a93b8f7c6
Test encode/decode of attachments
...
b/15089448
Change-Id: Ifd2afcfb36c9820c5d64ebbcc3230603b2a27089
2014-05-21 10:25:08 -07:00
James Lemieux
837aba39d5
Sanitize HTML email bodies in Android Email
...
b/14567151
Sanitizes HTML email bodies on demand as they are requested from
EmailMessageCursor. Also alters Account settings to indicate that emails can be
assumed to be sanitized and transform scripts can be applied to the email
bodies.
Change-Id: I789e6de3569ae8c7d2c21f0b5aa590d7638a1467
2014-05-20 16:26:58 -07:00
Anthony Lee
9768a05376
Merge "Factored out Watchdog code and cleaned up other stuff." into ub-mail-master
2014-05-20 22:41:16 +00:00
Anthony Lee
a72a12241f
Factored out Watchdog code and cleaned up other stuff.
...
Moved testing code to the bottom of the file. The next CL
should be the removal of the DownloadSet. Also fixed b/15003801,
so that the test will not fail.
Change-Id: Ie8320782d6b292d5a367af95d7c58d70a4213ead
2014-05-20 15:11:03 -07:00
Andrew Sapperstein
6c31d220a8
Support hooks for new contact photo source.
...
b/11387812
Change-Id: If081d58941dca0a330905dc2d80148df336995d5
2014-05-20 14:40:08 -07:00
Tony Mantler
c0ab393308
am ee818ac8: Add missing space in MIME header
...
* commit 'ee818ac89862d67a645131d3077f3a9556423ec2':
Add missing space in MIME header
2014-05-20 18:42:14 +00:00
Tony Mantler
ee818ac898
Add missing space in MIME header
...
Also skip adding the filename if none exists
b/13138456
Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
(cherry picked from commit 8b80821645
2014-05-20 18:16:41 +00:00
The Android Automerger
fe553fab60
merge in ub-mail-master-release history after reset to 2fbd8c269c
2014-05-19 20:00:15 -07:00
Tony Mantler
2fbd8c269c
Merge "Add missing space in MIME header" into ub-mail-master
2014-05-19 22:10:18 +00:00
Tony Mantler
8b80821645
Add missing space in MIME header
...
Also skip adding the filename if none exists
b/13138456
Change-Id: I2e3d82c2a560049cfc3fcd0130f4c6d8020757a2
2014-05-19 15:05:07 -07:00
Martin Hibdon
6e7a92ad68
am 5c5ed8f1: Merge "Bump version number" into ub-mail-algol
...
* commit '5c5ed8f14a341444bdef6764338450023b48bc3a':
Bump version number
2014-05-19 21:49:07 +00:00
Tony Mantler
7da60fe49c
am 9a44073e: Fix the remainder of save-alert cases
...
* commit '9a44073e75027b191dec209ade0ae4988e48b4ca':
Fix the remainder of save-alert cases
2014-05-19 21:45:56 +00:00
Martin Hibdon
5c5ed8f14a
Merge "Bump version number" into ub-mail-algol
2014-05-19 21:45:54 +00:00
Martin Hibdon
7aa399bc37
Bump version number
...
Change-Id: Icf8cb5db2a8da6c99d5cbf458b4a22dfe6ec45e1
2014-05-19 14:42:41 -07:00
Tony Mantler
9a44073e75
Fix the remainder of save-alert cases
...
b/14969455
Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
(cherry picked from commit 28dd431c23
2014-05-19 21:41:13 +00:00
Jin Cao
81ff6fae02
am cd4a94b7: Dependent change caused by refactor of FolderSelectors
...
* commit 'cd4a94b7e1ff89961c422682d562149744dac0e7':
Dependent change caused by refactor of FolderSelectors
2014-05-19 21:26:54 +00:00
Jin Cao
cd4a94b7e1
Dependent change caused by refactor of FolderSelectors
...
b/9174917
Change-Id: I1d644fe52b3b3e0c3428c6007d4c591a87a45e6c
2014-05-19 12:41:00 -07:00
Baligh Uddin
488b061b3a
am ed6e6cc2: (-s ours) am cbbb6e19: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ed6e6cc27414827867bf2c6f5df745a9ee032f27':
Import translations. DO NOT MERGE
2014-05-16 23:19:26 +00:00
Baligh Uddin
ed6e6cc274
am cbbb6e19: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cbbb6e1901a3390aadab10d26d2065164b0ef914':
Import translations. DO NOT MERGE
2014-05-16 23:14:54 +00:00
Baligh Uddin
cbbb6e1901
Import translations. DO NOT MERGE
...
Change-Id: I5a9f397fdd8d2dc4267988f9c97097f9ad380bad
Auto-generated-cl: translation import
2014-05-16 16:03:34 -07:00
