Commit Graph

7637 Commits

Author SHA1 Message Date
Marc Blank
1bcf32e1b2 Don't sync at all if 1) upsync and 2) held
Bug: 7148468

Change-Id: I93a7734f274263e09ddef1b5cf7d9d7ea58a17c3
2012-09-11 18:07:55 -07:00
mindyp
885a86c4bf Fix swipe settings text
Fixes b/6991536 Swipe conversation strings in settings

Change-Id: I9f4d954665982d1e24e8c7bd4b26ee7da3c9378e
2012-09-11 16:43:12 -07:00
Marc Blank
a1464d13a9 Merge "Bump version" into jb-ub-mail 2012-09-11 10:17:06 -07:00
Marc Blank
1e528157ef Bump version
Change-Id: Idc398ceef7a00c1cc2639282df93b568de9b0730
2012-09-11 10:14:58 -07:00
Marc Blank
f5ae803847 Merge "Make sure EmailContent is initialized" into jb-ub-mail 2012-09-11 10:14:20 -07:00
Marc Blank
92561ecd56 Make sure EmailContent is initialized
Bug: 7142845
Change-Id: I4299ab2627a4427ff8e96958b2c27f2f827e7794
2012-09-11 10:00:34 -07:00
Marc Blank
8580511541 Handle loadMore when no messages are loaded
Bug: 7129772
Change-Id: I9d2fd4f2bc488930c53e9fe44dc3fa852409b5c0
2012-09-11 09:05:59 -07:00
Marc Blank
a88fb32724 Merge "Modify intent names" into jb-ub-mail 2012-09-10 18:37:14 -07:00
Marc Blank
74c79a5043 Modify intent names
Change-Id: Iad8b4842056a7f553363f9af47e65665c2b26a5d
2012-09-10 17:18:32 -07:00
Marc Blank
6f40c2e78e Bump version
Change-Id: Ic71d2d4a66e1ce6872c1e815baa5c9199df01598
2012-09-10 14:01:57 -07:00
Marc Blank
4417adce6d Don't clear errorMap due to upload sync
* Clearing it will prevent backoff behavior from working
  properly when there are changes to be uploaded

Change-Id: I1a1509e42730a3aa36298e3024068b6fe993e045
2012-09-10 12:45:53 -07:00
Marc Blank
d8b2b8aebd Merge "Add "System Folders" settings" into jb-ub-mail 2012-09-10 11:52:11 -07:00
Marc Blank
266064bcc7 Add "System Folders" settings
* Add this category and preferences for setting the trash
  and sent items folders

Bug: 7100092

Change-Id: I964e02e5e319b3f04b030d36ed7dca30ed046362
2012-09-10 11:07:18 -07:00
Baligh Uddin
b41c9be836 Import translations. DO NOT MERGE
Change-Id: I6083a21b80a8edebdcd0c4505d981c6214d9933e
Auto-generated-cl: translation import
2012-09-10 08:53:08 -07:00
Paul Westbrook
5c9b9a4447 increment versionCode
Change-Id: Ia767e02d450dd809c9065d73ea7b001614cd3bc6
2012-09-09 18:34:12 -07:00
Marc Blank
b621f625ef Merge "Don't reset user's port number in settings" into jb-ub-mail 2012-09-09 10:51:44 -07:00
Marc Blank
19e9291c9a Merge "Use correct attachment provider authority" into jb-ub-mail 2012-09-09 10:45:37 -07:00
Marc Blank
665b19e779 Don't reset user's port number in settings
* Spinner onItemSelected is called prior to user input; this
  reverts the port to the security-based default

Change-Id: I1cb67e519e9305ef2384b5f5f305bff1e950e7c4
2012-09-09 10:41:39 -07:00
Marc Blank
393b859577 dump is @hide; remove @Override
Change-Id: I4df3a75a7d0747e62ddd4bbc23ab4008344e49a1
2012-09-09 10:20:12 -07:00
Marc Blank
323954df41 Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail 2012-09-09 10:15:18 -07:00
Marc Blank
16b07e11c7 Merge "Use resource based mime type for application" into jb-ub-mail 2012-09-09 10:15:05 -07:00
Marc Blank
6e5bccf2c9 Use correct attachment provider authority
* Make sure new code works with old Attachment rows

Bug: 7130972
Change-Id: Ia5d258930f39266517eead535a92bb4380fdb594
2012-09-09 09:32:14 -07:00
Marc Blank
81b0f74efa Create requireSetup attribute; use it for gImap
Change-Id: Id5f37861e4d6f2c2ed0fe98bd8b4d7eb73868c09
2012-09-08 13:08:50 -07:00
Marc Blank
7e5df63fc9 Use resource based mime type for application
Change-Id: I41a3cbf5c810668f9b0885f6614b2e48215901b2
2012-09-08 10:50:40 -07:00
Marc Blank
af092bd5f8 EmailProvider dump
Change-Id: Id975c99427b41f4a56235dc6ba5ad515d6700fe5
2012-09-07 19:02:25 -07:00
Marc Blank
fdb1635868 More work on FolderPicker
* Only show for Imap2 (hard-coded now w/ STOPSHIP)
* Don't show more than once
* Make sure all folders are set up completely before showing

Change-Id: Ie745c7e2f155496482d213ecfc9eff2009bb23ee
2012-09-07 14:14:19 -07:00
Marc Blank
8c8a68a717 Prevent looping w/ exceptions during IDLE
Bug: 7126413

Change-Id: If1d435a93845e0fd06be54328f6a0cbc161e5a9d
2012-09-07 09:10:05 -07:00
Marc Blank
dc1655bce3 Bump version
Change-Id: Ida0841a2e9f62784ece25be5e51de66ceaec2c62
2012-09-06 18:06:16 -07:00
Marc Blank
9a341d85f0 Merge "Improve trash folder picker upon account creation" into jb-ub-mail 2012-09-06 17:49:34 -07:00
Marc Blank
14e5f567ed Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail 2012-09-06 16:03:51 -07:00
Marc Blank
983c78e928 Log capabilities (w/ STOPSHIP)
Change-Id: Id448fd48ee1d7a2eabab8f3bd4dae34b6e401a7d
2012-09-06 16:03:07 -07:00
Marc Blank
2616405471 Improve trash folder picker upon account creation
* Use setup intent uri
* TODO: More cleanup

Bug: 7077441

Change-Id: Ieab5b0ed33b73b7a0e9012aedd6becf867db1566
2012-09-06 16:01:45 -07:00
Marc Blank
2f5897589e Merge "Clean up imap2 logging" into jb-ub-mail 2012-09-06 14:28:27 -07:00
Baligh Uddin
05fdc7dec9 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-06 14:02:49 -07:00
Marc Blank
41e78c168e Clean up imap2 logging
Change-Id: I53b522ea33d8bb1b070d994fd765d1eec2f60fb4
2012-09-06 12:42:47 -07:00
Mark Wei
3487ae89f2 Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail 2012-09-06 11:47:49 -07:00
Marc Blank
a2c286493d Bump version
Change-Id: I2ff95ad2f955e455627a6908374380e92eae0546
2012-09-05 13:45:06 -07:00
Mark Wei
5b3fda11de Add supplementary account info to outbound google.com links
Bug: 6661601
Change-Id: Ifae6d4a0f30c8233a1b51971168a19f1548718ca
2012-09-05 13:43:51 -07:00
Marc Blank
b210f3ad53 Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail 2012-09-05 13:41:18 -07:00
Marc Blank
c0a425027b Revert "Initialize mDatabase on provider startup"
This reverts commit 6c319d78ed

Change-Id: I57881b090a3c7efba79369702356b622d9a7aba8
2012-09-05 13:41:07 -07:00
Marc Blank
c0e2b147e0 Clear visibleLimit when folder entered
Change-Id: I39824dbff83ffcf109cbc1ffebf00cad5bce2498
2012-09-05 12:52:06 -07:00
Baligh Uddin
c713035238 Import translations. DO NOT MERGE
Change-Id: I8c7968c624f3d7bc2dd31a1504fc48bd62bd41c8
Auto-generated-cl: translation import
2012-09-05 10:32:27 -07:00
Marc Blank
d2bf25ac8b Make sure body loading finishes when searching
Bug: 7107329
Change-Id: Ief78b1c31a7c363cd2e23ef1b7d4ff9e26c219b7
2012-09-05 10:25:34 -07:00
Marc Blank
7110183fe5 Merge "Put combined account last" into jb-ub-mail 2012-09-05 09:58:23 -07:00
Marc Blank
2651bcc7be Put combined account last
Bug: 7100404
Change-Id: Iff2884e635d030d840f297c15f5e2ee646185c5f
2012-09-05 09:49:55 -07:00
Marc Blank
db1c845212 Handle mime encoded sender in convo list
Bug: 6901954
Change-Id: I5f9915592d4d859bd8ddd0185890015923390fbe
2012-09-04 19:33:48 -07:00
Baligh Uddin
2c2508607c Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-04 11:57:16 -07:00
Marc Blank
9765f7b284 Merge "Initialize mDatabase on provider startup" into jb-ub-mail 2012-09-04 08:55:50 -07:00
Marc Blank
5a2b9579de Prevent possible NPE
Change-Id: I0254812c55cf6c5e4825aa28f900b8030502e9f6
2012-09-03 19:57:41 -07:00
Marc Blank
6c319d78ed Initialize mDatabase on provider startup
* Try to prevent startup-related races

Bug: 6969684
Change-Id: I58ac16381bb71b8e21e01cb3ead0ba99f70c9873
2012-09-03 18:58:24 -07:00