Baligh Uddin
aaa1f8cd1d
Import translations. DO NOT MERGE
...
Change-Id: Ifabf8fcf26cf387a2c66a09d1525f636d7fde0f1
Auto-generated-cl: translation import
2014-03-26 15:20:06 -07: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
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
Tony Mantler
250d2f9fb8
Merge "Move protocol selection before credential collection" into ub-mail-master
2014-03-13 22:00:25 +00:00
James Lemieux
2c74c0efae
Merge "Move Help & feedback to Nav drawer." into ub-mail-master
2014-03-13 21:45:54 +00:00
Tony Mantler
d2ffe23fca
Move protocol selection before credential collection
...
b/13454985
Change-Id: Iabaf74e3212bb2e3b02e55ec947f0e9a32b597e5
2014-03-13 14:11:06 -07:00
Tony Mantler
f6a945a6cf
Clean up cert handling in AccountSetupCredentialsFragment
...
b/13453003
Change-Id: I87567c7e5cb39c7366c8ed346b0e300c3fc6da16
2014-03-13 11:30:25 -07:00
Tony Mantler
e31979ae2e
Tweak conditions for diverting back to the password screen
...
b/13451098
Change-Id: Id0422342aeac3647324afd8e41f6611069a27aad
2014-03-13 10:56:24 -07:00
James Lemieux
31ce5555b8
Move Help & feedback to Nav drawer.
...
b/11061485
HELP and SEND FEEDBACK are now the two bottom-most drawer
items in the Navigation drawer when it is present or in
the overflow menu when it is not present.
SEND FEEDBACK still behaves as always.
HELP has been redesigned so that it displays the help
content in a local webview rather than using an external
browser.
Change-Id: I01003f3cd6f8dedbcfb95ae87872968dfc6be48b
2014-03-12 16:56:56 -07:00
Martin Hibdon
351aa25ccb
Merge "Add the password failed warning text" into ub-mail-master
2014-03-12 22:21:26 +00:00
Martin Hibdon
40baa96c3f
Add the password failed warning text
...
Now, if you fail to authenticate on the credentials fragment,
instead of taking you to the full accountSetupIncoming,
it just takes you back to the credentials fragment with
a warning that your password is wrong.
Also, make it so that pressing "next" on the password IME behaves
the same as pressing the Next button.
Change-Id: Ice91c842659c33ba6f8ac876356a79265c703e2e
2014-03-12 15:19:11 -07:00
Tony Mantler
cac33a2e91
Allow entry into account settings when inbox is null
...
b/13436061
Change-Id: I544aa55000a91fe121de9bc7963eb89115d4758d
2014-03-12 15:05:50 -07:00
Tony Mantler
ee9cdebcb2
Merge "When opening account settings, divert to AccountSecurity if needed" into ub-mail-master
2014-03-12 20:53:05 +00:00
Tony Mantler
5ca9d39008
Merge "Centralize EmailServiceInfo retreival and pre-fill data for autodiscover" into ub-mail-master
2014-03-12 20:24:39 +00:00
Tony Mantler
f05a87ab47
Buttons have states
...
Will wonders never cease?
b/13364213
Change-Id: I040529894a7607c3574c2fd7646cd53590f12431
2014-03-11 16:08:29 -07:00
Tony Mantler
85d2451148
When opening account settings, divert to AccountSecurity if needed
...
b/12843721
Change-Id: Ic7ae99a8f3ddba33d224387921a90624c37bc8b5
2014-03-11 15:09:37 -07:00
Andrew Sapperstein
07d674f9fe
Send empty data for permalink/clipped fields.
...
b/2887917
Change-Id: I08e0317d3350732c6de9569d67d9a39b1a9ebf2e
2014-03-11 14:30:14 -07:00