The Android Automerger
76213185ad
merge in ub-mail-master-release history after reset to ddacf491c3
2014-08-05 13:28:21 -07:00
Jin Cao
ddacf491c3
am 65848dc5
: Merge "Support the new MOVE_FAILED_TO_DRAFT operation in Email" into ub-gmail-ur14-dev
...
* commit '65848dc5e0b1b1dd8c7f4fdb8dcae1bff2894dbb':
Support the new MOVE_FAILED_TO_DRAFT operation in Email
2014-08-04 17:52:31 +00:00
Geoff Mendal
033d40ed37
Import translations. DO NOT MERGE
...
Change-Id: Ie21859c638fe7eee6fdb1f3856d4d71b456386af
Auto-generated-cl: translation import
2014-08-04 08:03:13 -07:00
Paul Westbrook
a1f282a665
am 0ef2851a
: Add proguard rules for small unit test
...
* commit '0ef2851aebcb20513f80896f9c4103a530df6af0':
Add proguard rules for small unit test
2014-08-02 00:55:02 +00:00
Paul Westbrook
0ef2851aeb
Add proguard rules for small unit test
...
These methods were being stripped, but are needed by the unit tes
Change-Id: I15495c2cb4c83d6f1a00bac20da715352eb58275
2014-08-01 17:33:49 -07:00
Paul Westbrook
36ad0d430c
am d37ca267
: Clean up proguard test flags file
...
* commit 'd37ca267dd24cf628a5c1d92fea535492568e407':
Clean up proguard test flags file
2014-08-01 23:51:58 +00:00
Paul Westbrook
d37ca267dd
Clean up proguard test flags file
...
Change-Id: I2db858b59e0b1c6ff199aa7b11b99ee6e019ea72
2014-08-01 16:44:56 -07:00
Paul Westbrook
3f16bf9a37
am bc65885e
: Merge "Use test proguard config for eng builds" into ub-gmail-ur14-dev
...
* commit 'bc65885e24dc6981c2578b1e6cd01c2aaf74cfdd':
Use test proguard config for eng builds
2014-08-01 19:25:14 +00:00
Andrew Sapperstein
cabfc82791
am 0a17fcfa
: temp fix for b/16730607
...
* commit '0a17fcfae53d75f1a9e9b897b041a4696e7f7683':
temp fix for b/16730607
2014-08-01 18:53:33 +00:00
Andrew Sapperstein
0a17fcfae5
temp fix for b/16730607
...
Change-Id: I1474955d82442ad10527e2a308fa19bec7b144e9
2014-08-01 11:41:50 -07:00
Jin Cao
65848dc5e0
Merge "Support the new MOVE_FAILED_TO_DRAFT operation in Email" into ub-gmail-ur14-dev
2014-08-01 08:29:25 +00:00
Jin Cao
99e882e22d
Support the new MOVE_FAILED_TO_DRAFT operation in Email
...
Default the MOVE_FAILED_TO_DRAFT action to simply deleting
the failed message from Outbox for Email since this is the
current behavior.
b/4080109
Change-Id: I74917d0b2581e2dd145906dddfac395efc2d8206
2014-08-01 17:15:44 -07:00
Paul Westbrook
bc65885e24
Merge "Use test proguard config for eng builds" into ub-gmail-ur14-dev
2014-08-01 08:29:25 +00:00
Paul Westbrook
2fb24a2e4a
Use test proguard config for eng builds
...
Since unit tests only run on eng builds, modify the proguard config to
only keep the methods/classes needed for unit tests in eng builds
The test proguard config probably is keeping too many methods. We should
also evaluate whether it is valid for unit test to use methods that are not
used in user builds
The resulting apk size is 8714188 bytes, from 9866129
According to the proguard output, the final number of program classes is
4409, from the previous count of 10932
Change-Id: Ie7065a454e1ff80a4b3f953684940d88b17f6db7
2014-08-01 11:08:18 -07:00
Anthony Lee
54dc0fdb7b
am 347c5117
: Update version for L
...
* commit '347c5117e4c4bce2007467bd63b433d10be2cd4a':
Update version for L
2014-07-31 21:47:23 +00:00
Tony Mantler
072da2b033
am 751da261
: Add Exchange fallback and support diverting to Gmail
...
* commit '751da261722f6b8964c9a4f4b198aeb730addb50':
Add Exchange fallback and support diverting to Gmail
2014-07-31 21:47:22 +00:00
Tony Mantler
59c259d66f
am 16176e5b
: Imap folders are case sensitive
...
* commit '16176e5bb73300a06f7f7d15019951c0add40740':
Imap folders are case sensitive
2014-07-31 21:47:20 +00:00
Anthony Lee
347c5117e4
Update version for L
...
Change-Id: Ibbf09dfffe3d2b01cda364ef1d884270360e0a29
(cherry picked from commit 73eacd6ead
)
2014-07-31 21:44:57 +00:00
Tony Mantler
751da26172
Add Exchange fallback and support diverting to Gmail
...
b/16679701
Change-Id: I59d7cb4a803f0ad8e782614d0c6cc635318d2375
(cherry picked from commit d039322f74
)
2014-07-31 21:44:26 +00:00
Tony Mantler
16176e5bb7
Imap folders are case sensitive
...
For real this time
b/16686642
Change-Id: Ib484c2ac3505ff35bc643bbc51597f1ceb4e7f7e
(cherry picked from commit 60e5abbc56
)
2014-07-31 21:43:22 +00:00
The Android Automerger
59b231492b
merge in ub-mail-master-release history after reset to 7063124d1d
2014-07-30 10:40:20 -07:00
Geoff Mendal
7063124d1d
Import translations. DO NOT MERGE
...
Change-Id: I71c2cbaec779d2aa773ba61ece2a303de448e9f8
Auto-generated-cl: translation import
2014-07-30 09:09:33 -07:00
Tony Mantler
751a029c31
Convert server settings to dialog
...
b/8134410
Change-Id: I3c4c9a02a37571a9c7af10971840fbe39458244e
2014-07-29 15:12:04 -07:00
Tony Mantler
6e976f1d05
Update Email with Material icon
...
b/16632858
Change-Id: I611075c836fa8eeb24450aacfbef780af7bedcd2
2014-07-28 15:04:23 -07:00
Anthony Lee
ebe49cfeaf
b/16570506. Only enable alternate EAS authenticator when needed.
...
The old code was turning on both the EAS authenticator and the
alternate EAS authenticator (with the offending string). Now it
turns on the right one depending on the VendorPolicyLoader.
Change-Id: I69945e695f28fdb8bd33bf49ee253a354c05b30c
2014-07-28 14:37:02 -07:00
Tony Mantler
e495f17a4f
Merge "Add support for disabling OAuth on setup flow only" into ub-mail-master
2014-07-25 21:16:23 +00:00
Jay Shrauner
11f15608d6
Disable backup
...
Disable all backup
Bug:16676574
Change-Id: I20bd8dc4466a4534990576d272942ca611caf883
2014-07-30 10:05:55 -07:00
Tony Mantler
e96791403e
Add support for disabling OAuth on setup flow only
...
b/16633826
Change-Id: Iea984ae656fbf3fe44de7598fdb9357a18d52a74
2014-07-30 09:55:16 -07:00
Martin Hibdon
aaa26e8c3f
Merge "Disable Eas Authenticator if Exchange is not installed" into ub-mail-master
2014-07-24 22:43:15 +00:00
Martin Hibdon
74dc106ae9
Disable Eas Authenticator if Exchange is not installed
...
b/16541219
Change-Id: Ibc2a9608278762e6af4f7c429b08ad38935bfcae
2014-07-24 15:46:15 -07:00
Martin Hibdon
29180e6b36
Merge "Update version" into ub-mail-master
2014-07-24 15:37:54 +00:00
Martin Hibdon
266a7572a9
Update version
...
Change-Id: Ie69a887b0b6cff95cb5f0400788e057e59b312c7
2014-07-24 15:31:39 -07:00
Anthony Lee
20110e6288
Factor out the guts of setupAccountManagerAccount()
...
The new function will be called by the old function but it also allows
me to use it from the Migration code.
Change-Id: If9b2ad82479d60c63e8924d42fb6ce18d7d9a2f8
2014-07-24 13:28:26 -07:00
Anthony Lee
7a5f8d6c47
Merge "Update version for L" into ub-mail-master
2014-07-24 15:36:21 +00:00
Anthony Lee
73eacd6ead
Update version for L
...
Change-Id: Ibbf09dfffe3d2b01cda364ef1d884270360e0a29
2014-07-31 14:04:37 -07:00
Tony Mantler
742f94b3c0
Merge "Imap folders are case sensitive" into ub-mail-master
2014-07-31 20:35:09 +00:00
Tony Mantler
d039322f74
Add Exchange fallback and support diverting to Gmail
...
b/16679701
Change-Id: I59d7cb4a803f0ad8e782614d0c6cc635318d2375
2014-07-31 11:10:29 -07:00
Tony Mantler
60e5abbc56
Imap folders are case sensitive
...
For real this time
b/16686642
Change-Id: Ib484c2ac3505ff35bc643bbc51597f1ceb4e7f7e
2014-07-31 10:01:52 -07:00
Andrew Sapperstein
a0389a26b8
Remove unused string.
...
Change-Id: I62a1ab0db1e8dbc80b49cbd16b35f1f1f47b6a6d
2014-07-23 17:27:48 -07:00
The Android Automerger
57c0454d2f
merge in ub-mail-master-release history after reset to a64f39d5a2
2014-07-22 12:40:27 -07:00
Martin Hibdon
ae028b6c70
Add lower res versions of ic_setup_delete.png
...
b/16457587
Change-Id: I4bcb0c9498b680f117923802e68a0d6dc449a7e5
2014-07-21 13:39:25 -07:00
Tony Mantler
14a64cef86
IMAP mailboxes are case-sensitive
...
b/15694346
Change-Id: I4a59979f40d6118bb9c7e27069ea228ba783a4c3
2014-07-21 10:24:32 -07:00
Tony Mantler
cd118b3b61
Add support for launching setup flow via intent action
...
b/16371282
Change-Id: I9ee45d769a6f73fe1e44b7ca7607f8f0b54a703d
2014-07-18 15:35:35 -07:00
Baligh Uddin
a64f39d5a2
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-07-18 22:16:50 +00:00
Ray Chen
045aa05777
Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from
...
EmailProvider.
b/16400882
Change-Id: I2765fa6cea392e07b878fe063c7234582a485b1d
2014-07-22 11:31:37 +02:00
Baligh Uddin
28dacfbbf4
Import translations. DO NOT MERGE
...
Change-Id: I05c450ccc246284ebd339788a4856f9fa8b12511
Auto-generated-cl: translation import
2014-07-21 08:40:46 -07:00
Baligh Uddin
e678e39ece
Remove deprecated locales
...
Change-Id: I163e2b7fbe321fce2ee6b59c2370f109ffc05984
2014-07-17 15:43:12 -07:00
Paul Westbrook
0b060097ed
Merge "Use the prebuilt support library resources" into ub-mail-master
2014-07-16 01:00:53 +00:00
Paul Westbrook
f1212d4181
Use the prebuilt support library resources
...
Change-Id: I70853b5a73aa98e806adffdfceeb365f3949daa0
2014-07-16 11:46:01 +02:00
Ray Chen
7e75afadb1
com.android.mail.providers.Account contructors are no longer public
...
and clients need to use Account.builder().buildFrom(...) instead.
Change-Id: I7559540458ae549c399effc59392930ec914ffcc
2014-07-16 10:06:23 +02:00