James Lemieux
f3704242ee
am 32ce9913
: am 2a709716
: Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master
...
* commit '32ce991317f6a071431c2f55fcf41f5aee9a2759':
Marking conversations read/unread in the TL removes the snippet text
2014-07-24 23:32:45 +00:00
Tony Mantler
d94423f262
am cfba8f11
: am 9ccae204
: Merge "Make quick response UI in settings toggleable" into ub-mail-master
...
* commit 'cfba8f1159ced4ed79174e6423ff03f349cec8e9':
Make quick response UI in settings toggleable
2014-07-24 23:32:44 +00:00
Tony Mantler
03f725405b
am a38f2222
: am 46c95eb6
: Add new account intent is no longer forwarding
...
* commit 'a38f22224281ddeed6bcfe3ba8b263fb7d6961d7':
Add new account intent is no longer forwarding
2014-07-24 23:32:43 +00: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
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
Baligh Uddin
ab6a00faa0
am 7d48feb0
: keep history after reset to ub-mail-master-release
...
* commit '7d48feb0335f5a33c5ddd5397a9d4c0e181ed031':
2014-07-24 18:02:52 +00:00
The Android Automerger
2ed93592d7
am 57c0454d
: merge in ub-mail-master-release history after reset to a64f39d5a2
...
* commit '57c0454d2fbcc8c2891c902070bf30242438fbf5':
Remove deprecated locales
2014-07-24 18:02:51 +00:00
Baligh Uddin
6c95d3459d
am a64f39d5
: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-master
...
* commit 'a64f39d5a2a55ee48bc09c74c2b980ba1025d94f':
Import translations. DO NOT MERGE
2014-07-24 18:02:51 +00:00
Ray Chen
0b8f7a0e71
am 045aa057
: Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.
...
* commit '045aa05777a097717c1a915e66eb9ab671e02d56':
Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.
2014-07-24 18:02:50 +00:00
Martin Hibdon
faa218369e
am ae028b6c
: Add lower res versions of ic_setup_delete.png
...
* commit 'ae028b6c70f6412f8734859b0a2462bcbb0546d7':
Add lower res versions of ic_setup_delete.png
2014-07-24 18:02:49 +00:00
Tony Mantler
30ab1459a2
am 14a64cef
: IMAP mailboxes are case-sensitive
...
* commit '14a64cef863ae7b9b0cc7ec5542bfded0413c683':
IMAP mailboxes are case-sensitive
2014-07-24 18:02:48 +00:00
Tony Mantler
7d35f86b12
am cd118b3b
: Add support for launching setup flow via intent action
...
* commit 'cd118b3b61d2b68593a2da8e3ad9b2149c1f3d08':
Add support for launching setup flow via intent action
2014-07-24 18:02:47 +00:00
Paul Westbrook
1cd7d3473b
am 0b060097
: Merge "Use the prebuilt support library resources" into ub-mail-master
...
* commit '0b060097edfe8d738aa70ce75591fd09aafa052b':
Use the prebuilt support library resources
2014-07-24 18:02:46 +00:00
Ray Chen
f2cad7f952
am 7e75afad
: com.android.mail.providers.Account contructors are no longer public and clients need to use Account.builder().buildFrom(...) instead.
...
* commit '7e75afadb152659e3a237c62e4d95cefb60e228d':
com.android.mail.providers.Account contructors are no longer public and clients need to use Account.builder().buildFrom(...) instead.
2014-07-24 18:02:44 +00:00
Tony Mantler
733d7ea008
am 845001d2
: Merge "Add "Add Account" to prefs headers" into ub-mail-master
...
* commit '845001d250419eaf2230b7dd587432f352299e13':
Add "Add Account" to prefs headers
2014-07-24 18:02:40 +00:00
James Lemieux
32ce991317
am 2a709716
: Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master
...
* commit '2a70971689ec6e90878fbf39ee5a2f8242c681ef':
Marking conversations read/unread in the TL removes the snippet text
2014-07-24 18:02:39 +00:00
Tony Mantler
cfba8f1159
am 9ccae204
: Merge "Make quick response UI in settings toggleable" into ub-mail-master
...
* commit '9ccae204cfbb4271ff30d52ae232e6da6730ec2e':
Make quick response UI in settings toggleable
2014-07-24 18:02:38 +00:00
Tony Mantler
a38f222242
am 46c95eb6
: Add new account intent is no longer forwarding
...
* commit '46c95eb6c91eea4e2e5af42e10554b7c147399c5':
Add new account intent is no longer forwarding
2014-07-24 18:02:37 +00:00
Baligh Uddin
7d48feb033
keep history after reset to ub-mail-master-release
2014-07-24 10:06:03 -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
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
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
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
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
Baligh Uddin
203a8ce939
am b2e45297
: (-s ours) am 32cdf44d
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b2e452978f4af9a1616b6761c67c5d5553799635':
Import translations. DO NOT MERGE
2014-07-20 19:41:09 +00:00
Baligh Uddin
b2e452978f
am 32cdf44d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '32cdf44dc8ab593eb8c0f9a6df96acc21cdd3bd7':
Import translations. DO NOT MERGE
2014-07-20 19:37:52 +00:00
Baligh Uddin
32cdf44dc8
Import translations. DO NOT MERGE
...
Change-Id: I58cb7cd983c8af7db4552f2c0a6b8e2643acbd60
Auto-generated-cl: translation import
2014-07-20 11:37:20 -07:00
Baligh Uddin
4069135ae1
am 91a2961d
: am 3bc0e3e8
: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
...
* commit '91a2961db25958d3b6c384bd1947efa2ff77dbf7':
Remove deprecated locales - DO NOT MERGE
2014-07-20 18:08:26 +00:00
Baligh Uddin
585bf491c8
am 552c223f
: (-s ours) am bddd285f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '552c223f76060828065c16727644d6ad07f282a0':
Import translations. DO NOT MERGE
2014-07-20 18:06:20 +00:00
Tony Mantler
4d0b75adc5
am c1ecf693
: am 93cf39b4
: Add new account intent is no longer forwarding
...
* commit 'c1ecf693887890abbaa66d83655686b6e5bde17f':
Add new account intent is no longer forwarding
2014-07-20 18:03:16 +00:00
Baligh Uddin
91a2961db2
am 3bc0e3e8
: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
...
* commit '3bc0e3e802f37d03c7c3868690c5c1c7929d540d':
Remove deprecated locales - DO NOT MERGE
2014-07-20 02:39:55 +00:00
Baligh Uddin
552c223f76
am bddd285f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bddd285f36e4eeaf5d91d450b05fe15f8439b77b':
Import translations. DO NOT MERGE
2014-07-19 21:30:19 +00: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
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
Baligh Uddin
bddd285f36
Import translations. DO NOT MERGE
...
Change-Id: I497f38c763804b6aa353d084cd30f0d6382a1d17
Auto-generated-cl: translation import
2014-07-17 15:20:37 -07:00
Baligh Uddin
3bc0e3e802
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
2014-07-17 19:26:18 +00:00
Baligh Uddin
8dc49cfc08
Remove deprecated locales - DO NOT MERGE
...
Change-Id: I609fd54025b7e3962c4a430cbf41e1a03a8662ed
2014-07-19 13:05:22 -07:00
Tony Mantler
c1ecf69388
am 93cf39b4
: Add new account intent is no longer forwarding
...
* commit '93cf39b462b043a1b8407876d19b2e7ceeef9e7f':
Add new account intent is no longer forwarding
2014-07-17 18:03:57 +00:00
Tony Mantler
93cf39b462
Add new account intent is no longer forwarding
...
It now launches directly instead of bouncing through settings
b/16309940
Change-Id: I23ab9902f3b02e466626e08b842a5228193a7909
(cherry picked from commit 46c95eb6c9
)
2014-07-17 16:35:04 +00:00
Baligh Uddin
d66a37c197
am 284b6bf9
: am bf96e543
: keep history after reset to ub-mail-master-release
...
* commit '284b6bf9d0410c11ca5b579ac330d2be3c8a4f5c':
2014-07-16 19:21:22 +00:00
The Android Automerger
df2c6d54b4
am 56391f63
: am 5a9c5750
: merge in ub-mail-master-release history after reset to 5c93d36616
...
* commit '56391f6375767470751e2cc73a106b4835b4eb80':
Upgrade my logging from .e to .wtf
Add logging to help track down a bug causing invalid credentials
Increase touch target for adding authentication
Fix a NPE trying to download an attachment
Actually install the correct views when credentials fragment is in standalone mode
Update Email major version number to 6.3 so that it matches EmailGoogle
Update version
Fix temporary setup flow on tablets
Fix a crash bringing up settings
2014-07-16 19:21:21 +00:00
Jay Shrauner
a4b7a2cdfe
am fc1eecd7
: am 5c93d366
: Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
...
* commit 'fc1eecd7a8946c9ee078060e0c81b15f8a93c52f':
Fix NPE in uiSaveDraftMessage
2014-07-16 19:21:21 +00:00
Martin Hibdon
78acb775f1
am 354a881f
: am 1fa51773
: Merge "Add copyright notice" into ub-mail-master
...
* commit '354a881f65e359041df3d8d9796bdfe8a02a1bd3':
Add copyright notice
2014-07-16 19:21:20 +00:00