Commit Graph

12417 Commits

Author SHA1 Message Date
Baligh Uddin
e6fafe59fc keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 16:01:51 -07:00
Baligh Uddin
8fe82358a8 keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 15:40:43 -07:00
Baligh Uddin
43c1a25b06 am 844fd945: keep history after reset to ub-mail-klp-mr2-release@1078484
* commit '844fd945244e8c0fc8b198d3670f4effc94188f1':
2014-03-20 22:17:01 +00:00
The Android Automerger
2fae5b2abc am 8b22a343: merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2
* commit '8b22a343cef28618106edc8e2d3b35bb3dd4703a': (176 commits)
  Increment version.
  Increment version.
  Fix sync window preference being added multiple times
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix IMAP delete handling
  Fix tests
  Quit dropping inline attachments on the floor
  Add a placeholder flaky test.
  Convert Email tests to use android-support-tests
  Update the title for the oauth authentication screen
  Fix temporary setup flow on tablets
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Add @SmallTest annotation to test classes so they get run in continuous
  Fix some broken tests
  Update version number
  Fix unbounded async task creation in ADS
  Mark otherwise unused method as @VisibleForTesting
  ...
2014-03-20 22:17:00 +00:00
Yu Ping Hu
b9f25c3182 am 63eedeef: Increment email versioncode.
* commit '63eedeef0c73b6b72cb99ad9ec8c7a23ffc7df12':
  Increment email versioncode.
2014-03-20 22:17:00 +00:00
Tony Mantler
e060282038 am d7fe0ed8: Disambiguate providers between AOSP and EmailGoogle
* commit 'd7fe0ed83e631d1e3a768e462ab9a270d3da90e2':
  Disambiguate providers between AOSP and EmailGoogle
2014-03-20 22:16:59 +00:00
Yu Ping Hu
485429a6ba am 6621e1bf: Increment Email version.
* commit '6621e1bf45b5a38f486928ed9da49adfd6f23451':
  Increment Email version.
2014-03-20 22:16:49 +00:00
Anthony Lee
44ca30e591 am 7d888863: Merge "b/9564335. Add support for a maxAttachmentSize column in the Account table and connect the data to the Settings object in the existing location (SettingsColumns.MAX_ATTACHMENT_SIZE)." into ub-mail-klp-mr2
* commit '7d888863c4cda08c080479126f6668ff6abe7bb8':
  b/9564335. Add support for a maxAttachmentSize column in the Account table and connect the data to the Settings object in the existing location (SettingsColumns.MAX_ATTACHMENT_SIZE).
2014-03-20 22:16:46 +00:00
Yu Ping Hu
81c955c5da am 4633ca20: Increment version.
* commit '4633ca209f142000a8b42bbfd7f505afde27d503':
  Increment version.
2014-03-20 22:16:45 +00:00
Yu Ping Hu
6b1e66130d am 5c75a4d1: Increment version.
* commit '5c75a4d1983e38a85b0c39e73aadf67132e92c74':
  Increment version.
2014-03-20 22:16:44 +00:00
Yu Ping Hu
8f282ea817 am 4a5b11d6: Add sync to IEmailService.
* commit '4a5b11d650ff6bd79da1dfecc137af3433ce6ca8':
  Add sync to IEmailService.
2014-03-20 22:16:43 +00:00
Anthony Lee
ba7f828cee am 0132856e: Changed the IEmailService interface to accept and accountId in the loadAttachment() call. This work was necessary to support the new EasService & EasOperation infrastructure.
* commit '0132856e673d5fd79a33b3bbc6fa8c06ffc679ea':
  Changed the IEmailService interface to accept and accountId in the loadAttachment() call. This work was necessary to support the new EasService & EasOperation infrastructure.
2014-03-20 22:16:40 +00:00
Yu Ping Hu
b8df4a4982 am 3e8ff1a6: Add pushModify to IEmailService.
* commit '3e8ff1a647854eb818faf3a7140da3a98c2c196b':
  Add pushModify to IEmailService.
2014-03-20 22:16:39 +00:00
Jerry Xie
3710b79a2b am c8ed7857: Get Email units to compile in mr2 branch
* commit 'c8ed7857613373646d472bba86f678fc5084e4b0':
  Get Email units to compile in mr2 branch
2014-03-20 22:16:38 +00:00
Jerry Xie
f4b10b31bc am 89b8fdca: Disable, suppress, remove broken and obsolete Email tests
* commit '89b8fdca1841efd832e05cee877ab3eaf3780aae':
  Disable, suppress, remove broken and obsolete Email tests
2014-03-20 22:16:38 +00:00
Jerry Xie
59ca99ef3f am 475a7626: Add makefile for EmailTests
* commit '475a7626fb094723c767682a4739a5de34d0a3ad':
  Add makefile for EmailTests
2014-03-20 22:16:37 +00:00
Jerry Xie
3e2de0906a am 515d830e: Get Email units to compile
* commit '515d830e8755d3674e04bcc60d7f85b4fa7fb202':
  Get Email units to compile
2014-03-20 22:16:35 +00:00
Yu Ping Hu
e37f74b5ed am d715e17b: Delete unused functions from IEmailService.aidl.
* commit 'd715e17b2876a7420a88ae6c90526aecea7f233f':
  Delete unused functions from IEmailService.aidl.
2014-03-20 22:16:34 +00:00
Baligh Uddin
844fd94524 keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 14:26:59 -07:00
The Android Automerger
8b22a343ce merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-03-17 20:15:18 -07:00
Geoff Mendal
700ce94849 Import translations. DO NOT MERGE
Change-Id: I8464d0831aeb82d47bf98e5ed6c7020981282561
Auto-generated-cl: translation import
2014-03-17 13:42:30 -07:00
Yu Ping Hu
63eedeef0c Increment email versioncode.
Change-Id: Ibad7f855b4af87ade4bfd901004f83c11d5d8cbe
2014-03-14 11:26:21 -07:00
The Android Automerger
718faba647 merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-03-10 21:43:15 -07:00
Baligh Uddin
6eed5cd035 Import translations. DO NOT MERGE
Change-Id: Ie2cb2cf5324f5cb082966a94bd5d36418ef1a895
Auto-generated-cl: translation import
2014-03-10 16:30:02 -07:00
Tony Mantler
d7fe0ed83e Disambiguate providers between AOSP and EmailGoogle
b/13323222

Change-Id: I7d10182973b57e4c2c306739a15237952a7e6c95
(cherry picked from commit 9ef3c8b3f8)
2014-03-10 22:56:48 +00:00
Yu Ping Hu
6621e1bf45 Increment Email version.
Change-Id: Ieb52d7a298564077d112034728da47859da8e055
2014-03-10 11:47:44 -07:00
Anthony Lee
7d888863c4 Merge "b/9564335. Add support for a maxAttachmentSize column in the Account table and connect the data to the Settings object in the existing location (SettingsColumns.MAX_ATTACHMENT_SIZE)." into ub-mail-klp-mr2 2014-03-07 00:58:17 +00:00
Anthony Lee
4b33b983d7 b/9564335. Add support for a maxAttachmentSize column in the Account
table and connect the data to the Settings object in the existing
location (SettingsColumns.MAX_ATTACHMENT_SIZE).

Change-Id: Iaf48995757511e1dfb65aa35ff6d81bbc47187bd
2014-03-06 15:52:58 -08:00
Yu Ping Hu
cce566bd29 Increment version.
Change-Id: I2b32ccf57763e10cb39d3197c8a4ed65c8de0c6a
2014-03-06 11:16:09 -08:00
Yu Ping Hu
4633ca209f Increment version.
Change-Id: I2b32ccf57763e10cb39d3197c8a4ed65c8de0c6a
2014-03-05 23:15:24 -08:00
Yu Ping Hu
dcccc04426 Increment version.
Change-Id: I4a9279ee66350970bd0bd0656d1d0b008561fc08
(cherry picked from commit 5c75a4d198)
2014-03-05 18:22:50 +00:00
Yu Ping Hu
5c75a4d198 Increment version.
Change-Id: I4a9279ee66350970bd0bd0656d1d0b008561fc08
2014-03-05 10:17:47 -08:00
The Android Automerger
1f35a6fd51 merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-03-04 06:45:10 -08:00
Baligh Uddin
39558ccc06 Import translations. DO NOT MERGE
Change-Id: Id981f31e642c1369de70f4cda93cf2716bb515ad
Auto-generated-cl: translation import
2014-03-03 13:30:36 -08:00
Yu Ping Hu
4a5b11d650 Add sync to IEmailService.
This supports the EasService design.

Yes, I just removed a startSync function from this interface last month. No,
I didn't quite know at the time that I'd be adding one back. :)

Change-Id: I19d9c7838473d8982560764fdba0056cba03d132
2014-03-03 11:30:11 -08:00
Anthony Lee
0132856e67 Changed the IEmailService interface to accept and accountId in
the loadAttachment() call. This work was necessary to support
the new EasService & EasOperation infrastructure.

Change-Id: Idd507aec999596ccd4afa5f03ff2b3c2e38a9029
(cherry picked from commit efac8255ed75d22e60036e19e7a95f8407d18ad3)
2014-03-03 19:25:38 +00:00
Yu Ping Hu
3e8ff1a647 Add pushModify to IEmailService.
This call lets the service know that the push settings for an
account have changed.

Change-Id: I7ed41853df6af6762c80283a2a3510ce41551657
(cherry picked from commit 446136a2278652c627068ecddff534de1ad431ab)
2014-02-28 01:41:22 +00:00
The Android Automerger
cb408cec8b merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-02-27 16:52:27 -08:00
The Android Automerger
2614aa24eb merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2 2014-02-27 16:44:14 -08:00
Jerry Xie
c8ed785761 Get Email units to compile in mr2 branch
Change-Id: I471a47f21ce75daf82f0a09b071119f995a76778
2014-02-27 15:04:34 -08:00
Jerry Xie
89b8fdca18 Disable, suppress, remove broken and obsolete Email tests
Change-Id: Ia4dcba1c6966f23dd2a15e69324b7345aed8f944
(cherry picked from commit 7037a0bd3d)
2014-02-27 20:29:11 +00:00
Jerry Xie
475a7626fb Add makefile for EmailTests
Change-Id: Ic441b5cea9efd0b714a00a69c5b8483ddd11fafa
(cherry picked from commit d241290f0b)
2014-02-27 20:26:08 +00:00
Jerry Xie
515d830e87 Get Email units to compile
Change-Id: I171a0e2421c5006d9862ad94f886932146547020
(cherry picked from commit 17d3a29c9d)
2014-02-27 20:23:38 +00:00
Tony Mantler
39d63b746c Merge "Fix sync window preference being added multiple times" into ub-mail-master 2014-02-27 17:25:44 +00:00
Yu Ping Hu
d715e17b28 Delete unused functions from IEmailService.aidl.
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97

Conflicts:
	src/com/android/email/service/ImapService.java
2014-02-26 17:08:18 -08:00
Tony Mantler
9ef2c5f2cf Fix sync window preference being added multiple times
Also clean up potential NPE

b/13109860

Change-Id: I46bebd6af6329679af28b6b997cd33fca97376dd
2014-02-26 16:02:12 -08:00
Baligh Uddin
e41461c151 Import translations. DO NOT MERGE
Change-Id: I814417b33835cb75d196077b56c073514235a9c4
Auto-generated-cl: translation import
2014-02-26 13:11:12 -08:00
Baligh Uddin
c52d433f99 Import translations. DO NOT MERGE
Change-Id: Idd56836e92a0ae18eb94755e52c6982024c62b89
Auto-generated-cl: translation import
2014-02-26 13:09:45 -08:00
Tony Mantler
dde11440e1 Merge "Fix IMAP delete handling" into ub-mail-master 2014-02-26 00:40:30 +00:00
Baligh Uddin
7f6855864c Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-02-25 17:23:25 +00:00