Commit Graph

12332 Commits

Author SHA1 Message Date
Baligh Uddin
986d782f8c am c4e50f92: (-s ours) am 4bc986c2: (-s ours) am 34b6d033: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'c4e50f92dbe5d3b4b6e98f002349e7fbec698164':
  Import translations. DO NOT MERGE
2014-03-25 21:23:25 +00:00
Baligh Uddin
3778200467 am 8b91fb31: (-s ours) am 512cde93: (-s ours) am 52827e7e: (-s ours) am 06b532af: (-s ours) am 0596fe1c: (-s ours) Import translations. DO NOT MERGE
* commit '8b91fb311e1e5599af8b9aa4f933dd275a5b7c1f':
  Import translations. DO NOT MERGE
2014-03-25 21:21:13 +00:00
Baligh Uddin
c4e50f92db am 4bc986c2: (-s ours) am 34b6d033: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '4bc986c2f7bd95c4832e6db0b58f2e5f6ecce747':
  Import translations. DO NOT MERGE
2014-03-25 20:13:16 +00:00
Baligh Uddin
4bc986c2f7 am 34b6d033: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '34b6d03366679099d15c10d19131e2afb3c503f0':
  Import translations. DO NOT MERGE
2014-03-25 20:02:26 +00:00
Baligh Uddin
34b6d03366 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-25 19:52:58 +00:00
Baligh Uddin
8b91fb311e am 512cde93: (-s ours) am 52827e7e: (-s ours) am 06b532af: (-s ours) am 0596fe1c: (-s ours) Import translations. DO NOT MERGE
* commit '512cde9353cfd8615349d9abecbd87df2754ef2a':
  Import translations. DO NOT MERGE
2014-03-25 17:27:19 +00:00
Baligh Uddin
512cde9353 am 52827e7e: (-s ours) am 06b532af: (-s ours) am 0596fe1c: (-s ours) Import translations. DO NOT MERGE
* commit '52827e7e2f831ecdda69f6c3a4c11b74e0cb98c8':
  Import translations. DO NOT MERGE
2014-03-25 17:19:44 +00:00
Baligh Uddin
52827e7e2f am 06b532af: (-s ours) am 0596fe1c: (-s ours) Import translations. DO NOT MERGE
* commit '06b532af44c8fb94302c3a4b22b78323e030fe14':
  Import translations. DO NOT MERGE
2014-03-25 17:02:12 +00:00
Baligh Uddin
06b532af44 am 0596fe1c: (-s ours) Import translations. DO NOT MERGE
* commit '0596fe1c33bfef9cb8c6ee1a643e402dd6dfa018':
  Import translations. DO NOT MERGE
2014-03-25 16:54:58 +00:00
Baligh Uddin
6c427791f7 Import translations. DO NOT MERGE
Change-Id: Ib27b49a65350c56b2fd4dee2f0330b7167eff086
Auto-generated-cl: translation import
2014-03-24 14:06:43 -07:00
Baligh Uddin
baa0a44782 Import translations. DO NOT MERGE
Change-Id: I535a89db7039dda8190e312a3748ee7d7e469e16
Auto-generated-cl: translation import
2014-03-24 14:04:34 -07:00
Baligh Uddin
0596fe1c33 Import translations. DO NOT MERGE
Change-Id: I5e2d08fddc8b5f0b66359b24a99ba8f2d298626a
Auto-generated-cl: translation import
2014-03-24 14:03:56 -07:00
Baligh Uddin
d3cde5dbf0 keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 17:07:17 -07:00
Baligh Uddin
84ae6d7939 keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 16:45:11 -07:00
Baligh Uddin
b5b7c6296c keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 16:38:08 -07:00
Baligh Uddin
ddaa542615 keep history after reset to ub-mail-klp-mr2-release@1078484 2014-03-20 16:24:24 -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