Tony Mantler
564a5343cc
Merge "Don't allow empty or null filenames" into ub-mail-master
2014-05-05 16:14:56 +00:00
The Android Automerger
cd8c2e8297
merge in master-release history after reset to 73f1fd0a57
2014-05-05 05:50:08 -07:00
The Android Automerger
e4de62f009
merge in master-release history after reset to 73f1fd0a57
2014-05-04 05:50:00 -07:00
The Android Automerger
dc85529e82
merge in master-release history after reset to 73f1fd0a57
2014-05-03 05:51:15 -07:00
Tony Mantler
d0b54a2948
Don't allow empty or null filenames
...
b/14500106
Change-Id: I519e4a0fe392c3bdbb84f1ccbdea89f07b9c1426
2014-05-02 16:42:46 -07:00
Jay Shrauner
2fc13087e7
Parse abbreviated date fields
...
Add support for abbreviated dates with no timestamp (eg, "2009-01-02") to
parseEmailDateTimeToMillis.
Bug:14496986
Change-Id: Ifc77cb75fd9e23536b48c8f6ecefc0e2e8f1cc2c
2014-05-02 16:17:17 -07:00
Tony Mantler
f21e6a8983
Merge "Don't allow non-constant format strings" into ub-mail-master
2014-05-02 17:28:49 +00:00
Tony Mantler
d786b90cb5
Don't allow non-constant format strings
...
Also clean up warnings and delete unused code
b/14488939
Change-Id: I0fc552b8437958331c30f2ddd05ae33c0010e79f
2014-05-02 10:05:27 -07:00
Baligh Uddin
e5e0028d74
am 66e638ff
: (-s ours) Import translations. DO NOT MERGE
...
* commit '66e638ffca80b57dc732853ee6b9736f5cbd61b9':
Import translations. DO NOT MERGE
2014-05-02 02:25:02 +00:00
Baligh Uddin
66e638ffca
Import translations. DO NOT MERGE
...
Bug: 14472966
Change-Id: I6263fd44e59d573496092229e9442f5021c8b6d4
Auto-generated-cl: translation import
2014-05-02 02:20:58 +00:00
Tony Mantler
f837c474a4
resolved conflicts for merge of 0d7c7091
to ub-mail-master
...
Change-Id: Id754089f16146daf0c07f77208d55c2406c997c5
2014-05-01 15:27:21 -07:00
Tony Mantler
0d7c709125
Always return a valid Uri for account inbox
...
Also don't return virtual folders unless real folders exist
b/14319452
Change-Id: Id5f62f5ccc4d5488ae467df741b0598a158ceb81
2014-05-01 15:05:15 -07:00
Baligh Uddin
611e49e41a
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-05-01 16:43:18 +00:00
Baligh Uddin
c54374c5ff
am a41c1bd1
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a41c1bd1b1aaa9b3e295076dea1d134bcf1f89b5':
Import translations. DO NOT MERGE
2014-05-01 16:33:32 +00:00
The Android Automerger
0104e82127
merge in master-release history after reset to 9632caddbd
2014-05-01 05:50:50 -07:00
Baligh Uddin
9333181a13
Import translations. DO NOT MERGE
...
Change-Id: Ifd9c6352f3b9a74c6e922cb1b4c87ae71dd01fbb
Auto-generated-cl: translation import
2014-04-30 13:55:00 -07:00
Baligh Uddin
a41c1bd1b1
Import translations. DO NOT MERGE
...
Change-Id: I4490880603d2cc350e87097d379b161ae185403d
Auto-generated-cl: translation import
2014-04-30 13:53:32 -07:00
Baligh Uddin
73f1fd0a57
Import translations. DO NOT MERGE
...
Change-Id: I6d2f3e4bc874c13d1acb79f68bf470c527e606f3
Auto-generated-cl: translation import
2014-04-30 13:52:39 -07:00
Jay Shrauner
988d2b6e85
Fix Exchange crash when parsing abbreviated dates
...
Detect fully qualified and abbreviated date/time stamps in parseDateTime.
Previously parsed fully qualified forms like 20090211T180303Z; now also
parses 20090211.
Bug:14279251
Change-Id: I9a99ae16a5c1fe87b977fbebdba307baa653d539
2014-04-30 09:53:00 -07:00
The Android Automerger
f47c8cc239
merge in master-release history after reset to 4e7d7a057f
2014-04-30 05:51:06 -07:00
Bill Yi
9632caddbd
am 2ed7ccb0
: am 22766dcf
: Merge commit \'3d083cfdd24471d58f7e4979265a51ec5b1f6c3f\' into HEAD
...
* commit '2ed7ccb0056490fa60c0511fd256d244d308d69b':
2014-04-30 12:50:17 +00:00
Bill Yi
2ed7ccb005
am 22766dcf
: Merge commit \'3d083cfdd24471d58f7e4979265a51ec5b1f6c3f\' into HEAD
...
* commit '22766dcf6a44416b2972c053739472317017257d':
2014-04-30 00:59:33 +00:00
Tony Mantler
40de3040e9
Merge "Warnings and finals" into ub-mail-master
2014-04-29 21:22:01 +00:00
Baligh Uddin
9b632705bd
am b244ac85
: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
...
* commit 'b244ac85cdb225642b03c8c679b8a1f55d4c9e57':
Import translations. DO NOT MERGE
2014-04-29 21:13:49 +00:00
Baligh Uddin
b244ac85cd
Merge "Import translations. DO NOT MERGE" into ub-mail-algol
2014-04-29 21:12:10 +00:00
Baligh Uddin
e9ec9e9bf4
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-04-29 21:12:05 +00:00
Tony Mantler
d3154ecc6e
Warnings and finals
...
Change-Id: Idc31b2f3376db73b90558fb22bdcdf4ff6f92b7d
2014-04-29 13:36:24 -07:00
Tony Mantler
4aec413a1e
Warnings and Finals
...
Change-Id: I47f29c16c066eb077c64ef8c89e91df88d15caf0
2014-04-29 11:46:22 -07:00
Anthony Lee
5bf5dc9ea4
Merge "Created the new AttachmentService class." into ub-mail-master
2014-04-29 18:36:55 +00:00
Bill Yi
22766dcf6a
Merge commit '3d083cfdd24471d58f7e4979265a51ec5b1f6c3f' into HEAD
2014-04-29 11:34:24 -07:00
Anthony Lee
cd2495ebdd
Created the new AttachmentService class.
...
This is a straight up copy of the AttachmentDownloadService and
a rename. All the future Attachment work will be done in this
class and we'll flip the switch when it is ready.
Change-Id: I2990cbfd1f7c8e2946c155ea1c124223d0f47ff9
2014-04-29 11:20:40 -07:00
Martin Hibdon
087ace34ea
am 03d80363
: Merge "Update the font for account setup basics" into ub-mail-algol
...
* commit '03d80363fa397aa79f4b587e120e6072bd3e270f':
Update the font for account setup basics
2014-04-29 17:48:35 +00:00
Martin Hibdon
03d80363fa
Merge "Update the font for account setup basics" into ub-mail-algol
2014-04-29 17:46:37 +00:00
Anthony Lee
c70c1b5267
Merge "Make sure that queries against the Body table have ID columns." into ub-mail-master
2014-04-29 16:49:05 +00:00
The Android Automerger
7696ee56f5
merge in master-release history after reset to e31bd0ba89
2014-04-29 05:50:52 -07:00
Anthony Lee
533093abd7
Make sure that queries against the Body table have ID columns.
...
Performed some cleanup and updated the source key projection
to include an ID to make sure that EmailMessageCursor works
properly.
Change-Id: I272fac474de876fdd2a08136e0ba97b3f5dc2c7e
2014-04-28 16:11:04 -07:00
Martin Hibdon
d8ffbc2798
am f318cac8
: Merge "Update version" into ub-mail-algol
...
* commit 'f318cac84f9e455e24d5c48dc4ad3ec5baa961e2':
Update version
2014-04-28 22:33:32 +00:00
Martin Hibdon
f318cac84f
Merge "Update version" into ub-mail-algol
2014-04-28 22:31:13 +00:00
Martin Hibdon
de437fcc32
Update version
...
Change-Id: I3683df2afb2d973a067668a2caf1d66e24813ba1
2014-04-28 15:20:24 -07:00
Martin Hibdon
3264276e6c
Update the font for account setup basics
...
b/14386385
Change-Id: Ica54796333b48bb04822406a6e2a719570840949
2014-04-28 14:58:50 -07:00
Baligh Uddin
07e5d791e8
Import translations. DO NOT MERGE
...
Change-Id: I4c7f2d5f6667d749260bcd5c17e6f8cbeb771c32
Auto-generated-cl: translation import
2014-04-28 13:32:00 -07:00
Baligh Uddin
31f72d0343
Import translations. DO NOT MERGE
...
Change-Id: Ia8463964cff67d2bd1d1b39c2555c20ad06b3cdc
Auto-generated-cl: translation import
2014-04-28 13:30:43 -07:00
Baligh Uddin
4e7d7a057f
Import translations. DO NOT MERGE
...
Change-Id: Ie49c78b93f2042a5b75d0e54b72057ecf56464f2
Auto-generated-cl: translation import
2014-04-28 13:30:02 -07:00
The Android Automerger
3c551d0c5e
merge in master-release history after reset to e31bd0ba89
2014-04-28 05:49:53 -07:00
The Android Automerger
5c5334e1cc
merge in master-release history after reset to e31bd0ba89
2014-04-27 05:49:57 -07:00
The Android Automerger
9ab39e8836
merge in master-release history after reset to e31bd0ba89
2014-04-26 05:51:36 -07:00
Tony Mantler
2ac92114ad
Merge "Fix cancel handling in account settings screens" into ub-mail-master
2014-04-25 00:41:28 +00:00
Tony Mantler
294593c5f5
Fix cancel handling in account settings screens
...
- Don't loop on the confirmation dialog
- Do a deep copy of the initial hostauth state
- Save the initial hostauth state on configuration changes
- Collect the user input before comparing the old state with the new
b/14285245
Change-Id: Ibc033fac525be2a4cb03c6a0d1e92254a2236b4c
2014-04-24 16:12:55 -07:00
Andrew Sapperstein
d4088d1b8a
am 241eeec2
: Remove save to drive from eml viewer. b/14277510
...
* commit '241eeec2b3f7f5a0159d1a313c31d6682c439511':
Remove save to drive from eml viewer. b/14277510
2014-04-24 21:53:40 +00:00
Andrew Sapperstein
241eeec2b3
Remove save to drive from eml viewer. b/14277510
...
Change-Id: I918e66fb009976543bcb8a58b1b4597a5b268062
2014-04-24 10:39:58 -07:00