Commit Graph

13408 Commits

Author SHA1 Message Date
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
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
The Android Automerger
59b231492b merge in ub-mail-master-release history after reset to 7063124d1d 2014-07-30 10:40:20 -07:00
Jay Shrauner
11f15608d6 Disable backup
Disable all backup

Bug:16676574
Change-Id: I20bd8dc4466a4534990576d272942ca611caf883
2014-07-30 10:05:55 -07:00
Geoff Mendal
96403efe66 am dcbb060c: (-s ours) am 3a03a2dc: (-s ours) Import translations. DO NOT MERGE
* commit 'dcbb060c591d1e51b0eaa00ea7e48832a77a90ea':
  Import translations. DO NOT MERGE
2014-07-30 16:45:06 +00:00
Geoff Mendal
dcbb060c59 am 3a03a2dc: (-s ours) Import translations. DO NOT MERGE
* commit '3a03a2dc139669ceab6de5264f79d69042bd57df':
  Import translations. DO NOT MERGE
2014-07-30 16:10:56 +00: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
Baligh Uddin
d7e529ebf2 am a799134f: (-s ours) am 5d5cad3b: (-s ours) Import translations. DO NOT MERGE
* commit 'a799134fcf92fc5de8e77b865ee5034015ceec0d':
  Import translations. DO NOT MERGE
2014-07-28 23:27:38 +00:00
Baligh Uddin
a799134fcf am 5d5cad3b: (-s ours) Import translations. DO NOT MERGE
* commit '5d5cad3b0d3ed4ec7fc361cf9b379430f68022c4':
  Import translations. DO NOT MERGE
2014-07-28 23:21:02 +00: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
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
Baligh Uddin
661b0c8a10 am ab6a00fa: am 7d48feb0: keep history after reset to ub-mail-master-release
* commit 'ab6a00faa02067d9011a865dce05d09f2f0d961b':
2014-07-24 23:32:53 +00:00
The Android Automerger
566ad257a8 am 2ed93592: am 57c0454d: merge in ub-mail-master-release history after reset to a64f39d5a2
* commit '2ed93592d772103b1a5c8ff7ee44af37fe15d0cf':
  Remove deprecated locales
2014-07-24 23:32:52 +00:00
Baligh Uddin
4dc0315900 am 6c95d345: (-s ours) am a64f39d5: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-master
* commit '6c95d3459d3f34b8e5c1789818545c9467e3a199':
  Import translations. DO NOT MERGE
2014-07-24 23:32:51 +00:00
Ray Chen
390486dbfc am 0b8f7a0e: am 045aa057: Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.
* commit '0b8f7a0e7156168437bf05a50f7e5be1d4170a31':
  Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.
2014-07-24 23:32:50 +00:00
Martin Hibdon
e47c13b89a am faa21836: am ae028b6c: Add lower res versions of ic_setup_delete.png
* commit 'faa218369e327d822b96766e3d6b0a3a617be306':
  Add lower res versions of ic_setup_delete.png
2014-07-24 23:32:50 +00:00
Tony Mantler
709df3f45b am 30ab1459: am 14a64cef: IMAP mailboxes are case-sensitive
* commit '30ab1459a2a6885172f033b9ffccfd98521984cf':
  IMAP mailboxes are case-sensitive
2014-07-24 23:32:49 +00:00
Tony Mantler
7122ea6d2d am 7d35f86b: am cd118b3b: Add support for launching setup flow via intent action
* commit '7d35f86b12cf6a351ffc59204c180819970a5e6d':
  Add support for launching setup flow via intent action
2014-07-24 23:32:48 +00:00
Paul Westbrook
2c7a92ad48 am 1cd7d347: am 0b060097: Merge "Use the prebuilt support library resources" into ub-mail-master
* commit '1cd7d3473bade372e01474ef03e003c3af5c3658':
  Use the prebuilt support library resources
2014-07-24 23:32:47 +00:00
Ray Chen
7f8ef347db am f2cad7f9: am 7e75afad: com.android.mail.providers.Account contructors are no longer public and clients need to use Account.builder().buildFrom(...) instead.
* commit 'f2cad7f95219433b2376916a9cf17a660ca1d46c':
  com.android.mail.providers.Account contructors are no longer public and clients need to use Account.builder().buildFrom(...) instead.
2014-07-24 23:32:47 +00:00
Tony Mantler
f5fbe6b8e3 am 733d7ea0: am 845001d2: Merge "Add "Add Account" to prefs headers" into ub-mail-master
* commit '733d7ea008def7bf0df7990a72dfcef4aa78d665':
  Add "Add Account" to prefs headers
2014-07-24 23:32:46 +00:00