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
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
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
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
284b6bf9d0
am bf96e543
: keep history after reset to ub-mail-master-release
...
* commit 'bf96e543517fa453d694d8fde7eed65d5b40c6da':
2014-07-16 19:18:02 +00:00
The Android Automerger
56391f6375
am 5a9c5750
: merge in ub-mail-master-release history after reset to 5c93d36616
...
* commit '5a9c5750bc1221c01846470411abd56f58b39914':
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:18:00 +00:00
Jay Shrauner
fc1eecd7a8
am 5c93d366
: Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
...
* commit '5c93d3661603843d6bc0b9084a2633c7e3d08ab9':
Fix NPE in uiSaveDraftMessage
2014-07-16 19:18:00 +00:00
Martin Hibdon
354a881f65
am 1fa51773
: Merge "Add copyright notice" into ub-mail-master
...
* commit '1fa51773bf50fc9a8cb3ee55eeab8e9aec7694b3':
Add copyright notice
2014-07-16 19:17:59 +00:00
James Lemieux
68f02dec16
am 0e7a8dbe
: Merge "Replace all references to UnifiedEmail\'s com.android.oldbitmap with equivalent usage of framework\'s com.android.bitmap." into ub-mail-master
...
* commit '0e7a8dbed85da44acf8c2646f59e328c03ae248f':
Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap.
2014-07-16 19:17:58 +00:00
Tony Mantler
237bdba9c8
am 8f5ca5a7
: Rename AccountSettings to EmailPreferenceActivity
...
* commit '8f5ca5a790c4c05dd4ee6a8c769ff9817f40123b':
Rename AccountSettings to EmailPreferenceActivity
2014-07-16 19:17:57 +00:00
Martin Hibdon
af0554fcb9
am bb391e80
: Merge "Update IEmailService" into ub-mail-master
...
* commit 'bb391e8018a56f27bb2025accf5171491e4b2a14':
Update IEmailService
2014-07-16 19:17:56 +00:00
Tony Mantler
661fa10a96
am 6cf6b5c2
: Merge "Remove direct entry points to AccountSettings" into ub-mail-master
...
* commit '6cf6b5c2921e3dacf389d11f17971742d03e2ad3':
Remove direct entry points to AccountSettings
2014-07-16 19:17:54 +00:00
James Lemieux
bc0cced076
am f79ed0f5
: Merge "Remove attachment previews from Conversation List" into ub-mail-master
...
* commit 'f79ed0f54fb0cf8ec081d72ccaffdaf18fd7e0dd':
Remove attachment previews from Conversation List
2014-07-16 19:17:54 +00:00
Tony Mantler
27759dc7d8
am 436a0bde
: Merge "Add support for UPDATE_SETTINGS_URI" into ub-mail-master
...
* commit '436a0bdee550069322013b82c6dcb2edf11cca5f':
Add support for UPDATE_SETTINGS_URI
2014-07-16 19:17:53 +00:00
Milos Stankovic
c3f7ecdc99
am 4fb48202
: Moving Previous, Next and Done strings to UnifiedEmail.
...
* commit '4fb4820223b2b98b2a8517c9231950c0740cb15c':
Moving Previous, Next and Done strings to UnifiedEmail.
2014-07-16 19:17:52 +00:00
Régis Décamps
00ea75cda1
am c3404cca
: Better documentation for "Account display name".
...
* commit 'c3404cca71b3451e0bf79afe2abca45522738873':
Better documentation for "Account display name".
2014-07-16 19:17:51 +00:00
Tony Mantler
299aac4a24
am f90dbc83
: Strings aren\'t Integers
...
* commit 'f90dbc83e2853717a3470f8e530a8a7e1c58b2e6':
Strings aren't Integers
2014-07-16 19:17:50 +00:00
Tony Mantler
f836f8d0b7
am 4fb5412e
: Switch to material icons for Email
...
* commit '4fb5412e1b3a4fad45eed90c7040b6ff0fe323b8':
Switch to material icons for Email
2014-07-16 19:17:49 +00:00
Tony Mantler
6b8902c078
am 6c15188a
: Merge "Close body input streams" into ub-mail-master
...
* commit '6c15188a9ec334e0c1ea892852060b8360926300':
Close body input streams
2014-07-16 19:17:48 +00:00
Martin Hibdon
1595aa33ea
am 1d8fd9c0
: Add communication class for HostAuth
...
* commit '1d8fd9c05449863ac6a151a6db87c267c4f55ac2':
Add communication class for HostAuth
2014-07-16 19:17:47 +00:00
Baligh Uddin
2debaaa2b9
am c11f7b90
: (-s ours) am f6425011
: (-s ours) am 7611e3f7
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c11f7b9027d5e2ac64b0ebe59387e39ff000cbbc':
Import translations. DO NOT MERGE
2014-07-16 19:17:46 +00:00
Baligh Uddin
555c3df899
am fb620b36
: (-s ours) am 4f1a919b
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fb620b36b169cb3686cb31d7b7374b2ba6c46e49':
Import translations. DO NOT MERGE
2014-07-16 19:17:45 +00:00
Baligh Uddin
39aa9d02c9
am 0a74d7f0
: (-s ours) am 6012ef62
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0a74d7f0ccbe216626b276e89a64faa12a404375':
Import translations. DO NOT MERGE
2014-07-16 19:17:44 +00:00