Tony Mantler
b040379f1b
am b2dbba8d
: Christen ub-mail-algol with a new version number
...
* commit 'b2dbba8d9fe12065f56b6c42341fa1075ffba140':
Christen ub-mail-algol with a new version number
2014-03-26 22:22:58 +00:00
Baligh Uddin
aaa1f8cd1d
Import translations. DO NOT MERGE
...
Change-Id: Ifabf8fcf26cf387a2c66a09d1525f636d7fde0f1
Auto-generated-cl: translation import
2014-03-26 15:20:06 -07:00
Tony Mantler
b2dbba8d9f
Christen ub-mail-algol with a new version number
...
Change-Id: Ifdc73fe4354e9e74e9cba9c993051c742efb530f
2014-03-26 15:13:04 -07:00
Tony Mantler
2be297f1ba
Merge "Fix IMAP message upsync to include attachments." into ub-mail-master
2014-03-26 19:53:57 +00:00
Martin Hibdon
7bf3bb9947
Increase touch target for adding authentication
...
b/13642313
Change-Id: I9681cd6ad21e4da76cac3202dc61bdc49b978c71
2014-03-26 12:01:19 -07:00
Tony Mantler
0c8696c2eb
Fix IMAP message upsync to include attachments.
...
b/13138456
Change-Id: If16b619a650c640a37cb4563750a6327a5e601e6
2014-03-26 11:49:38 -07:00
Martin Hibdon
77ba9a751f
Merge "Minor formatting change" into ub-mail-master
2014-03-26 18:03:09 +00:00
Martin Hibdon
64b4f7dcff
Minor formatting change
...
b/13642247
Change-Id: I02e495142d8043c8749ab0bce21f4c7c1cea7a5f
2014-03-26 10:47:54 -07:00
Martin Hibdon
a44a63e273
Merge "Fix a NPE trying to download an attachment" into ub-mail-master
2014-03-26 17:46:58 +00:00
Martin Hibdon
adabb4285b
Fix a NPE trying to download an attachment
...
b/13642247
Change-Id: I4cfb7e4a3be12fdc8b8c345c1aeabd85a729d16a
2014-03-26 10:38:51 -07:00
Tony Mantler
9b0c0f77d9
Merge "Actually install the correct views when credentials fragment is in standalone mode" into ub-mail-master
2014-03-25 23:03:28 +00:00
Tony Mantler
fe7c3228eb
Actually install the correct views when credentials fragment is in standalone mode
...
b/13638835
Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
2014-03-25 15:51:06 -07:00
Andy Huang
5687c6dade
tighten inline attachment view intent builder
...
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
2014-03-25 13:30:16 -07:00
Baligh Uddin
085a96040d
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-03-25 19:53:09 +00:00
Yu Ping Hu
74c489f744
Restore xxxhdpi icons.
...
Bug: 11174042
Change-Id: I4c7e6336ef0a354bf4dc2ecefd129110fb2f974f
(cherry picked from commit faaec9f4e1c50d08c1050db3a2969452d536a13f)
2014-03-25 18:50:38 +00:00
Martin Hibdon
bebb80b0f4
Merge "Fix Calendar and Contacts syncing for POP and IMAP accounts" into ub-mail-master
2014-03-25 17:54:45 +00:00
Martin Hibdon
3f4a556d54
Fix Calendar and Contacts syncing for POP and IMAP accounts
...
b/11818312
Change-Id: I34b82040991506bf9099cc0df237454a8f97c764
2014-03-24 17:17:05 -07:00
Martin Hibdon
ae242766c2
Update Email major version number to 6.3 so that it matches EmailGoogle
...
Change-Id: If49106af7769933515d4baa432a024dd3631aa4a
2014-03-24 15:33:11 -07:00
Baligh Uddin
30816bcb5a
Import translations. DO NOT MERGE
...
Change-Id: I008a12776cdc42ec8e0e36d0d5666b030e599db7
Auto-generated-cl: translation import
2014-03-24 14:08:32 -07:00
Martin Hibdon
175efbdd37
Update version
...
Change-Id: I0b23c282e7816029ccc95ea0d4fa58ba4fa1cb8b
2014-03-24 12:52:41 -07:00
Scott Kennedy
50c5add15b
Merge "Switch to use chips in the new location" into ub-mail-master
2014-03-21 22:13:27 +00:00
Tony Mantler
0050cf4fff
Merge "Begin fixing layouts for account setup flows" into ub-mail-master
2014-03-21 21:49:39 +00:00
Scott Kennedy
e9c8ffac1f
Switch to use chips in the new location
...
Change-Id: I0210a6a877e1bce89287382ca749e3eb1d8dc7e6
2014-03-21 14:24:51 -07:00
Tony Mantler
20adb68b94
Begin fixing layouts for account setup flows
...
Also address some RTL issues
b/10784160
b/13544189
b/13585832
Change-Id: I5c86497940ce4b972e0ee9189418f120391a8833
2014-03-21 13:29:23 -07:00
Martin Hibdon
3021a60bc7
Merge "Only make Calendar and Contacts syncable on Exchange" into ub-mail-master
2014-03-20 19:57:05 +00:00
Martin Hibdon
6a51abdf6e
Only make Calendar and Contacts syncable on Exchange
...
b/11818312
We were using the existance of OPTIONS_CALENDAR_SYNC in the
bundle to indicate that syncing was possible, and it's value
to indicate whether automatic syncing should be enabled.
This is misleading.
Now, we check the serviceInfo for the account type to figure
out if sync calendar and contacts is possible, and use the
options passed in to indicate whether or not it should be
automatic.
Change-Id: I776519668c6630dc71153fb008218a7ca6357c74
2014-03-20 12:47:36 -07:00
Baligh Uddin
71f503d98e
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-03-20 18:44:33 +00:00
Anthony Lee
eba80c114e
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
Conflicts:
src/com/android/email/provider/DBHelper.java
2014-03-19 17:33:29 -07:00
Yu Ping Hu
8103f960d0
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
(cherry picked from commit 4a5b11d650
)
2014-03-20 00:11:36 +00:00
Anthony Lee
70cb2878d7
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-19 23:53:28 +00:00
Yu Ping Hu
701134953e
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-03-19 23:51:14 +00:00
Tony Mantler
c90680915d
Merge "Fix setup flow dialog dismissal" into ub-mail-master
2014-03-19 23:35:36 +00:00
Yu Ping Hu
f679cd08d1
Delete unused functions from IEmailService.aidl.
...
Change-Id: I131d2d3436a50c94d664fc57c6514481d9afbc97
(cherry picked from commit 8ff6c107867bc2044ba50cad010dbf4a2e93436e)
2014-03-19 22:35:47 +00:00
Tony Mantler
254dde761f
Fix setup flow dialog dismissal
...
Also remove redundant ok/cancel strings
b/13512724
Change-Id: Idfc7745fbf6a08f09051eb4a6154fc446b43eb67
2014-03-19 15:23:56 -07:00
Baligh Uddin
79690473cb
Import translations. DO NOT MERGE
...
Change-Id: Ibaa4bb9f7619568d5fc1cd3a125ae89b768e15ac
Auto-generated-cl: translation import
2014-03-19 14:27:34 -07:00
Tony Mantler
cc82c7bae2
Fix IME "Next" button handling in credentials screen
...
b/13544867
Change-Id: I63ba680a5551dd4bd860026b9110b20a2ae080b6
2014-03-19 11:13:04 -07:00
Tony Mantler
e93b81a51a
Merge "Fix back button handling on protocol choice screen" into ub-mail-master
2014-03-19 17:25:47 +00:00
Tony Mantler
b5a4433798
Fix back button handling on protocol choice screen
...
b/13543514
Change-Id: I27078220aca60ac5137fc69e34e52937313602c9
2014-03-19 10:09:24 -07:00
Tony Mantler
78d1c101c1
Merge "Move credential population to after we collect credentials" into ub-mail-master
2014-03-18 23:54:25 +00:00
Tony Mantler
d90643c732
Move credential population to after we collect credentials
...
b/13512724
Change-Id: I2df8064fc392a928d77291aa41630e4715bedc39
2014-03-18 16:46:33 -07:00
Martin Hibdon
088676a1f9
Merge "Update email version number" into ub-mail-master
2014-03-18 23:22:14 +00:00
Martin Hibdon
13e8a204bb
Update email version number
...
Change-Id: I066036e207330e4faa96ac47ad7445a0cf703d39
2014-03-18 16:17:29 -07:00
Tony Mantler
452744474a
Fix broken tests and remove dead code
...
Change-Id: I3ae31c604c86641622f997915dc7d86bf2c662a2
2014-03-18 13:57:11 -07:00
Tony Mantler
571a96c755
Merge "Account setup flow: Move button and headline handling into fragments" into ub-mail-master
2014-03-18 20:35:21 +00:00
Tony Mantler
ae980cd685
Account setup flow: Move button and headline handling into fragments
...
b/13508015
Change-Id: I9f7a09467fbee5a57985f36eaa47c2cc7b9d4086
2014-03-17 16:45:47 -07:00
Geoff Mendal
37798753ab
Import translations. DO NOT MERGE
...
Change-Id: Ic697d490d6df29f25a3deb4ec34c4da33e3b1154
Auto-generated-cl: translation import
2014-03-17 13:43:58 -07:00
Tony Mantler
7fbf3ac6d1
Merge "Skip protocol choice if user entered from system account manager" into ub-mail-master
2014-03-14 23:11:37 +00:00
Tony Mantler
53b64eee54
Skip protocol choice if user entered from system account manager
...
b/13475223
Change-Id: Id1ec6259e2b3880f9ce83ffe7795c40aa069466e
2014-03-14 15:48:10 -07:00
Andrew Sapperstein
98ade11ad6
Merge "Send empty data for permalink/clipped fields." into ub-mail-master
2014-03-14 22:16:38 +00:00
Tony Mantler
282edb95a3
Add an alternate force-create account path
...
Allows auto-filling account details using providers.xml
b/13456413
Change-Id: I1d7f6346e2f1d1cc339610be68ff7194210bc75c
2014-03-13 16:21:06 -07:00