Commit Graph

13303 Commits

Author SHA1 Message Date
Tony Mantler
bfd1be2c6e am df1a68eb: am 43106e9d: Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev
* commit 'df1a68ebd07b0912091a7f78e3428ef5d179c90a':
  Extend MailboxSettings to handle full folder list
2014-08-20 21:27:53 +00:00
Martin Hibdon
0f95edfcc2 am cd267c47: am 80982db3: Update email version number
* commit 'cd267c4744ad69ce592b014e5b1bbb96243169ed':
  Update email version number
2014-08-20 21:27:52 +00:00
Tony Mantler
f7ebff96cd am 5a8065ef: am ca02ab31: Don\'t export MailboxSettings
* commit '5a8065ef11d022d9a3d1292def7654756b010747':
  Don't export MailboxSettings
2014-08-20 21:27:41 +00:00
Baligh Uddin
352c13f6af am e29403d7: (-s ours) am a780beb0: (-s ours) Import translations. DO NOT MERGE
* commit 'e29403d7c88842ae885860c54500a0bdd4175601':
  Import translations. DO NOT MERGE
2014-08-20 21:27:40 +00:00
Baligh Uddin
a47009470d am 7ae1a977: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-master
* commit '7ae1a977d3335609a7c3278a4ee3f9cdbe8b98b9':
  Import translations. DO NOT MERGE
2014-08-20 21:27:39 +00:00
Martin Hibdon
3a7e664e73 am 2fc57a8b: Update email version number
* commit '2fc57a8bac1a47f47343ed95f0d8a77549615140':
  Update email version number
2014-08-20 21:27:38 +00:00
Tony Mantler
5063c85116 am 2cdb08d4: am ea0c4007: Use margin instead of padding to work around ICS/JB bug
* commit '2cdb08d4944f279e2eab78bb06d39210c3b9588a':
  Use margin instead of padding to work around ICS/JB bug
2014-08-20 21:27:37 +00:00
Baligh Uddin
c4a44f5d4b am 1a127a98: (-s ours) am 5a564d6a: (-s ours) am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '1a127a9806fe2d11c82076a7916142909fbc3b9b':
2014-08-20 21:27:36 +00:00
Baligh Uddin
49945eafea am 8564c78e: (-s ours) am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '8564c78e5dc020266137db71aefbed697420b5d6':
  Import translations. DO NOT MERGE
2014-08-20 21:27:35 +00:00
Tony Mantler
f18ca4aa66 am b3e36605: am 0c4f45e8: Add chromium.org to providers.xml
* commit 'b3e36605ac149eac7514930f6ecc11f94b026829':
  Add chromium.org to providers.xml
2014-08-20 21:27:34 +00:00
Tony Mantler
cc19ead675 am 428ebd72: am 4c865846: Don\'t return a protocol for a null account type
* commit '428ebd7260f0fef408b1391d93aec26976528dcb':
  Don't return a protocol for a null account type
2014-08-20 21:27:33 +00:00
Tony Mantler
5d0bbdf46a am 67f497c6: am f1789afa: Switch null checks to TextUtils.isEmpty()
* commit '67f497c634e5d89b4450eff8c0ba1311b4829216':
  Switch null checks to TextUtils.isEmpty()
2014-08-20 21:27:32 +00:00
Anthony Lee
a528ad3946 am 96f8d2ac: am 8218d006: Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev
* commit '96f8d2accda319da5c8026395fcf1c5e9cf11efb':
  Make sure that we close the cursor.
2014-08-20 21:27:31 +00:00
Tony Mantler
dd4aec40db am f0deafc8: am 1381d408: Skip null/empty account types
* commit 'f0deafc8162ba87f15b1a6f6531e29ee57b4b5df':
  Skip null/empty account types
2014-08-20 21:27:30 +00:00
Régis Décamps
17ba6a96af am 191937b6: am 34aae3cb: Merge "Fix getAllAmAccounts() returning duplicated accounts" into ub-gmail-ur14-dev
* commit '191937b69db3162647851966ecedb28f93a7922b':
  Fix `getAllAmAccounts()` returning duplicated accounts
2014-08-20 21:27:29 +00:00
Paul Westbrook
6cb0455771 am 222e8255: am e76b7bbf: Fix proguard rule
* commit '222e8255b15735bb0325b388430b2b237c396386':
  Fix proguard rule
2014-08-20 21:27:28 +00:00
Paul Westbrook
3dfa01bc36 am a27640e0: am 4764cb8d: Fix unit test
* commit 'a27640e01d80c2aefb85e399531d6313ff19bbcc':
  Fix unit test
2014-08-20 21:27:27 +00:00
Andrew Sapperstein
80ae596bef am 173dc408: am 36fd3893: Use ShortcutWidgetTheme.
* commit '173dc4086f403d4a3d87aa3ef61dc308f77f303f':
  Use ShortcutWidgetTheme.
2014-08-20 21:27:26 +00:00
Andrew Sapperstein
8c23dea6e1 am a43520ba: am 05a96bdc: switch to appcompat. b/16664350
* commit 'a43520ba56f23cdb399a83d70e29bcc224622600':
  switch to appcompat. b/16664350
2014-08-20 21:27:25 +00:00
Jin Cao
28e120256e am ddacf491: am 65848dc5: Merge "Support the new MOVE_FAILED_TO_DRAFT operation in Email" into ub-gmail-ur14-dev
* commit 'ddacf491c3b9d9a9d1af9e463a716db2a37bf648':
  Support the new MOVE_FAILED_TO_DRAFT operation in Email
2014-08-20 21:27:24 +00:00
Geoff Mendal
82f6f31e19 am 033d40ed: (-s ours) Import translations. DO NOT MERGE
* commit '033d40ed379f9e353dd30569f969780e16cc51fa':
  Import translations. DO NOT MERGE
2014-08-20 21:27:23 +00:00
Paul Westbrook
9caf770d50 am a1f282a6: am 0ef2851a: Add proguard rules for small unit test
* commit 'a1f282a665b756e7de8f05d414b64da6e506a49c':
  Add proguard rules for small unit test
2014-08-20 21:27:22 +00:00
Paul Westbrook
533687b1a0 am 36ad0d43: am d37ca267: Clean up proguard test flags file
* commit '36ad0d430c87a75f8c9293afaa141f2b590c42bd':
  Clean up proguard test flags file
2014-08-20 21:27:21 +00:00
Paul Westbrook
af669b9454 am 3f16bf9a: am bc65885e: Merge "Use test proguard config for eng builds" into ub-gmail-ur14-dev
* commit '3f16bf9a371fa183694c11bb3de9b482ed28be24':
  Use test proguard config for eng builds
2014-08-20 21:27:21 +00:00
Andrew Sapperstein
c35299e282 am cabfc827: am 0a17fcfa: temp fix for b/16730607
* commit 'cabfc827915f44bf0b1957a479ec9636df95b393':
  temp fix for b/16730607
2014-08-20 21:27:20 +00:00
Anthony Lee
afe29c1b8d am 54dc0fdb: am 347c5117: Update version for L
* commit '54dc0fdb7b0c83f246cec11ff6c21f1b6d3c33c5':
  Update version for L
2014-08-20 21:27:19 +00:00
Tony Mantler
0a4c3dc76b am 072da2b0: am 751da261: Add Exchange fallback and support diverting to Gmail
* commit '072da2b0331bab7d6195db3bb563756ddcf7c47c':
  Add Exchange fallback and support diverting to Gmail
2014-08-20 21:27:18 +00:00
Tony Mantler
fa94c99182 am 59c259d6: am 16176e5b: Imap folders are case sensitive
* commit '59c259d66f0ad751752b4f01c38aa05417e9640a':
  Imap folders are case sensitive
2014-08-20 21:27:17 +00:00
Anthony Lee
2817eb6cb7 am 7a5f8d6c: Merge "Update version for L" into ub-mail-master
* commit '7a5f8d6c474631cfbe16c7d05365addfa03550b8':
  Update version for L
2014-08-20 21:27:16 +00:00
Tony Mantler
81efad6a90 am 742f94b3: Merge "Imap folders are case sensitive" into ub-mail-master
* commit '742f94b3c07eadbc8e8cda2dcf20693971a37f71':
  Imap folders are case sensitive
2014-08-20 21:27:15 +00:00
Tony Mantler
12bcbdb483 am d039322f: Add Exchange fallback and support diverting to Gmail
* commit 'd039322f7402ef402eb66c92b899510dd6649e2d':
  Add Exchange fallback and support diverting to Gmail
2014-08-20 21:27:14 +00:00
Tony Mantler
1ebae38a16 am e495f17a: Merge "Add support for disabling OAuth on setup flow only" into ub-mail-master
* commit 'e495f17a4f22b047013b0011d261b42520c36013':
  Add support for disabling OAuth on setup flow only
2014-08-20 21:27:13 +00:00
Jay Shrauner
e7f57fdad5 am 11f15608: Disable backup
* commit '11f15608d62e9ac95ff4dbd8dcedec34ba4fe974':
  Disable backup
2014-08-20 21:27:12 +00:00
Geoff Mendal
fa147c6ace am 7063124d: (-s ours) Import translations. DO NOT MERGE
* commit '7063124d1dcf27292546500e873abe1d574e5a4b':
  Import translations. DO NOT MERGE
2014-08-20 21:27:11 +00:00
Tony Mantler
3d12b2ccc5 am 751a029c: Convert server settings to dialog
* commit '751a029c315e642e5ea979f38927ede34d82edfa':
  Convert server settings to dialog
2014-08-20 21:27:10 +00:00
Tony Mantler
a653ccf446 am 6e976f1d: Update Email with Material icon
* commit '6e976f1d05c1896070efc9df57267e37d8ae2152':
  Update Email with Material icon
2014-08-20 21:27:09 +00:00
Anthony Lee
1710a56c95 am ebe49cfe: b/16570506. Only enable alternate EAS authenticator when needed.
* commit 'ebe49cfeaf0328aa95f5cb82b731f08d7bae7b09':
  b/16570506. Only enable alternate EAS authenticator when needed.
2014-08-20 21:27:08 +00:00
Martin Hibdon
22302fbaac am aaa26e8c: Merge "Disable Eas Authenticator if Exchange is not installed" into ub-mail-master
* commit 'aaa26e8c3f5c8b56e0a8b5b21916a188c051f737':
  Disable Eas Authenticator if Exchange is not installed
2014-08-20 21:27:07 +00:00
Martin Hibdon
24eca87653 am 29180e6b: Merge "Update version" into ub-mail-master
* commit '29180e6b36c5cebf3ac25d4a31877387bc43e44a':
  Update version
2014-08-20 21:26:56 +00:00
Anthony Lee
ce2d44ddc0 am 20110e62: Factor out the guts of setupAccountManagerAccount()
* commit '20110e628830a906f4c6a80eabb0bb127bf7d4be':
  Factor out the guts of setupAccountManagerAccount()
2014-08-20 21:26:55 +00:00
Andrew Sapperstein
5a94c49c2f am a0389a26: Remove unused string.
* commit 'a0389a26b88705c375b0e144d1810ef46e1d0d8f':
  Remove unused string.
2014-08-20 21:26:53 +00:00
Baligh Uddin
3ff7d57698 am 421b73b4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '421b73b4fdacb10c47cce9fc9321fcf4c6923802':
  Import translations. DO NOT MERGE
2014-08-17 13:58:47 +00:00
Baligh Uddin
abdf5018d2 am 8706ea6a: (-s ours) am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit '8706ea6ab1711c9c1fd014a89fb5c25039174017':
  Import translations. DO NOT MERGE
2014-08-16 04:20:13 +00:00
Baligh Uddin
8706ea6ab1 am d9a3ebd6: (-s ours) am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit 'd9a3ebd6c62221ae0e3dafd34a3e1c65d6df7208':
  Import translations. DO NOT MERGE
2014-08-16 04:00:52 +00:00
Baligh Uddin
421b73b4fd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
ccc705116a Import translations. DO NOT MERGE
Change-Id: I9d081741671b2f03401bdde8bf9dfe7b00086eb3
Auto-generated-cl: translation import
2014-08-15 19:50:19 -07:00
Baligh Uddin
d9a3ebd6c6 am 307cf10c: (-s ours) Import translations. DO NOT MERGE
* commit '307cf10c2a64757bc91f375166f31728d417b508':
  Import translations. DO NOT MERGE
2014-08-15 22:20:20 +00:00
Baligh Uddin
307cf10c2a Import translations. DO NOT MERGE
Change-Id: I9d6ea0a8130f01da4face9fe1a5a64a96ae4b08d
Auto-generated-cl: translation import
2014-08-15 12:29:49 -07:00
Tony Mantler
df1a68ebd0 am 43106e9d: Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev
* commit '43106e9de3548603094107bec965b941c4e93c21':
  Extend MailboxSettings to handle full folder list
2014-08-13 22:13:40 +00:00
Martin Hibdon
cd267c4744 am 80982db3: Update email version number
* commit '80982db38b18ed85c1cd48c2cd1a76bc1d0ebcd9':
  Update email version number
2014-08-13 18:35:22 +00:00