Tony Mantler
f1789afa53
Switch null checks to TextUtils.isEmpty()
...
b/16872654
Change-Id: Ib8943f068ad6988ff08f8bfd54e2df8fa5ce0274
2014-08-07 14:11:02 -07:00
Anthony Lee
96f8d2accd
am 8218d006
: Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev
...
* commit '8218d00634356ec11e274380007f1b2574cb5547':
Make sure that we close the cursor.
2014-08-07 20:37:01 +00:00
Tony Mantler
b63e70f179
Skip null/empty account types
...
b/16730607
Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
(cherry picked from commit 1381d4083b
)
2014-08-07 20:28:41 +00:00
Tony Mantler
f0deafc816
am 1381d408
: Skip null/empty account types
...
* commit '1381d4083bbfdf046eceac081420ab3fa7a1ae81':
Skip null/empty account types
2014-08-07 20:24:49 +00:00
Tony Mantler
1381d4083b
Skip null/empty account types
...
b/16730607
Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
2014-08-07 12:58:18 -07:00
Anthony Lee
8218d00634
Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev
2014-08-07 15:00:45 +00:00
Anthony Lee
4524dccde8
Make sure that we close the cursor.
...
Found this problem while testing Email migration.
Change-Id: I07862b5c4dd2ef189a87f7dbd085030c448f365f
2014-08-07 13:13:21 -07:00
Régis Décamps
191937b69d
am 34aae3cb
: Merge "Fix getAllAmAccounts()
returning duplicated accounts" into ub-gmail-ur14-dev
...
* commit '34aae3cbc41deadd927b5d6cdbff33bfd0c22758':
Fix `getAllAmAccounts()` returning duplicated accounts
2014-08-07 08:53:14 +00:00
The Android Automerger
a1d60ff48a
merge in ub-mail-master-release history after reset to 222e8255b1
2014-08-06 16:24:27 -07:00
Paul Westbrook
222e8255b1
am e76b7bbf
: Fix proguard rule
...
* commit 'e76b7bbf78d9fe58e48773c18b88a597610750f2':
Fix proguard rule
2014-08-06 20:42:31 +00:00
Paul Westbrook
e76b7bbf78
Fix proguard rule
...
-keepclasseswithmembers is strict. If it isn't able to find any of the
methods listed, the whole class can be stripped
Bug: 16825652
Change-Id: I1e8eefba9e0cf4b596f7e8041161e12bde6b51c6
2014-08-06 00:41:47 -07:00
Paul Westbrook
a27640e01d
am 4764cb8d
: Fix unit test
...
* commit '4764cb8d4843a9d4ce5cf5b259ae6be7d3c5fa9c':
Fix unit test
2014-08-06 02:08:53 +00:00
Paul Westbrook
4764cb8d48
Fix unit test
...
Bug: 16825652
Change-Id: I1c139afb0f3aa50dca742ed48c92a16f9078ea59
2014-08-05 18:24:51 -07:00
Andrew Sapperstein
173dc4086f
am 36fd3893
: Use ShortcutWidgetTheme.
...
* commit '36fd3893815d9d07f880b5235eee98b169fd83ae':
Use ShortcutWidgetTheme.
2014-08-05 22:56:02 +00:00
Andrew Sapperstein
a43520ba56
am 05a96bdc
: switch to appcompat. b/16664350
...
* commit '05a96bdccdd04b9255e7b2c06ed286ed3c646471':
switch to appcompat. b/16664350
2014-08-05 22:56:01 +00:00
The Android Automerger
76213185ad
merge in ub-mail-master-release history after reset to ddacf491c3
2014-08-05 13:28:21 -07:00
Régis Décamps
34aae3cbc4
Merge "Fix getAllAmAccounts()
returning duplicated accounts" into ub-gmail-ur14-dev
2014-08-05 00:19:02 +00:00
Régis Décamps
f9d845c1b7
Fix getAllAmAccounts()
returning duplicated accounts
...
Use a set to save the account types, in order to de-duplicate identical
types.
Also, remove unused imports.
Bug: 16811863 Duplicate POP accounts are listed
Change-Id: If699d03b2c12959cfde9926bec9352b71c3d8912
2014-08-06 20:27:39 +02:00
Andrew Sapperstein
36fd389381
Use ShortcutWidgetTheme.
...
Fixes b/16767953 and b/16131423.
Also removes the obsolete ic_launcher_shortcut_folder.
Change-Id: I73e800b1e83b95eaa05cd800178a7de86072c00d
2014-08-04 20:05:17 +00:00
Andrew Sapperstein
05a96bdccd
switch to appcompat. b/16664350
...
Change-Id: I3391bc352d6b9bc2d59ca6ac0088e88b1edcc76d
2014-08-04 11:18:58 -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
Geoff Mendal
3a03a2dc13
Import translations. DO NOT MERGE
...
Change-Id: I157b5e94652c03c069027bbb151ee4bd2d583c6a
Auto-generated-cl: translation import
2014-07-30 09:05:28 -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
Baligh Uddin
5d5cad3b0d
Import translations. DO NOT MERGE
...
Change-Id: Id655d13a729ed4c5e4595ca3c72c72f18207eeec
Auto-generated-cl: translation import
2014-07-28 12:14:35 -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