Merge commit 'ede0c5c59e61f3b33fea2026dd952cf8d9bc42ef'
* commit 'ede0c5c59e61f3b33fea2026dd952cf8d9bc42ef':
Fix logic for use of "Sync Contacts" button value
Merge commit '805562e26f50bd57c3b9bd357644285d3f1941a4' into eclair-plus-aosp
* commit '805562e26f50bd57c3b9bd357644285d3f1941a4':
Fix logic for use of "Sync Contacts" button value
Merge commit 'a11e67552ba72f5e2f232a60d161778b6caa6254'
* commit 'a11e67552ba72f5e2f232a60d161778b6caa6254':
Rework ContactsSyncAdapter to handle untyped Email and IM data
Merge commit 'd46ec14e6e856191bed0a599aaeb8cde322c77d6' into eclair-plus-aosp
* commit 'd46ec14e6e856191bed0a599aaeb8cde322c77d6':
Rework ContactsSyncAdapter to handle untyped Email and IM data
Merge commit '6d1271aee78f195e094aca650d8dceee79fbb5e4' into eclair-plus-aosp
* commit '6d1271aee78f195e094aca650d8dceee79fbb5e4':
Fix crash in large tests (#2108431)
* This is required to due a change in ContactsProvider2 that removes
type information for these fields
Change-Id: I993aebdcace0e1db538a85afdea3389fe41518d8
Merge commit '2682d82b815087515f5fd4c043b9e95547bf4836'
* commit '2682d82b815087515f5fd4c043b9e95547bf4836':
Add sourceKey to Body table; add flags for reply/forward in Message
Merge commit '5ab8f10b224251927d4740e8d22339ef2c6f068d'
* commit '5ab8f10b224251927d4740e8d22339ef2c6f068d':
Replacing old contacts API references with new ones.
* Fixes 2048663, 2025029, and 2100131
* Add "Trust Certificates" checkbox in EAS account creation
* Use custom ClientConnectionManager for HttpClient with registry
for plain, ssl, and tssl (trusted ssl) connection
* Use a ConnectionPool for HttpClient connections
* Remove "Domain" checkbox in EAS account creation
* Remove tests related to the "Domain" field
* TODO Write a test for valid usernames (requires a bit of research)
<name>, <email address>, <domain>/<name, and <domain>\<name> are all
valid, but there might be others
Change-Id: I4a0338df5960bfd3d679a88aaf22d1c49f49992b
Merge commit '7f3f3f392df6243ce637937ebacfedcff63fca2e' into eclair-plus-aosp
* commit '7f3f3f392df6243ce637937ebacfedcff63fca2e':
Import revised translations. DO NOT MERGE
Merge commit 'e25698319325d5e9619bc45ae85d861b0f1c5954' into eclair-plus-aosp
* commit 'e25698319325d5e9619bc45ae85d861b0f1c5954':
Add sourceKey to Body table; add flags for reply/forward in Message
* Set reply/forward flag and sourceKey as appropriate in MessageCompose
* Update provider tests accordingly
Change-Id: I7f49d80a735314a1a38f09fbf1f234257c41af8c
Merge commit '4587efc1d3da8dc0b1759d7d82677f347b529830' into eclair-plus-aosp
* commit '4587efc1d3da8dc0b1759d7d82677f347b529830':
Replacing old contacts API references with new ones.
Merge commit '056cec00fcc54f141da2956bb2e6e4bd4522013f'
* commit '056cec00fcc54f141da2956bb2e6e4bd4522013f':
Re-enabling email suggestions and switching to new contacts API.
Merge commit 'bdf540b6c5779b1a9f87cbc3f44145bfac6adfad'
* commit 'bdf540b6c5779b1a9f87cbc3f44145bfac6adfad':
Have SyncManager stopSelf if there are no EAS accounts
Merge commit 'e8a37cf76955314da77ceaa2f341c7fa2513d01b' into eclair-plus-aosp
* commit 'e8a37cf76955314da77ceaa2f341c7fa2513d01b':
Re-enabling email suggestions and switching to new contacts API.
Merge commit '5b1ec907612642b1c92363e14c0d1aa296ae0c49' into eclair-plus-aosp
* commit '5b1ec907612642b1c92363e14c0d1aa296ae0c49':
Fix more broken large Email tests (#2087413)
Merge commit 'c688b085d0f1f88ad8eea58c15c2fcd82df7ea4b' into eclair-plus-aosp
* commit 'c688b085d0f1f88ad8eea58c15c2fcd82df7ea4b':
Have SyncManager stopSelf if there are no EAS accounts
Merge commit '9c84c2b2c643be5b375dc1f3115cf5714e3a856b'
* commit '9c84c2b2c643be5b375dc1f3115cf5714e3a856b':
Fix problem with case of attachment name in EAS
Merge commit '6e7ea8cfe6fa3fe4380964df53c51ba7812b6372' into eclair-plus-aosp
* commit '6e7ea8cfe6fa3fe4380964df53c51ba7812b6372':
Fix problem with case of attachment name in EAS
Merge commit '6e078ed33dc5d6aae1482f2b1557444dfa68ed0f'
* commit '6e078ed33dc5d6aae1482f2b1557444dfa68ed0f':
A bit more debugging to catch the service race condition.
Merge commit '7b03c7936a2fd238f366fe145619308e5b31a8ec' into eclair-plus-aosp
* commit '7b03c7936a2fd238f366fe145619308e5b31a8ec':
A bit more debugging to catch the service race condition.
Merge commit '34b55a4c14c61ad9a8e3e701fe33dc26d4b3bf3c'
* commit '34b55a4c14c61ad9a8e3e701fe33dc26d4b3bf3c':
Fix reply all behavior to prevent duplicates, etc.
Merge commit 'b8d0c55a05b97e53957dfd6619ea97edeca989cf' into eclair-plus-aosp
* commit 'b8d0c55a05b97e53957dfd6619ea97edeca989cf':
Fix reply all behavior to prevent duplicates, etc.
* Also create a bogus account if none exists to prevent setup failure
* Fixes#2087413 (Email large tests failing with Unknown URI)
* Fixes#2097361 (Duplicate email address when replying...)
Change-Id: I9ca2ac5f98db43e9009c22421c69956440356e34
- fix doPrevious() which was not correctly moving the cursor due to
bug 2100645
- correctly handle configuration change (keyboard open/close) by saving
the current message
- reorder the operations in onDelete: first move the cursor, and next
delete, to avoid the possibility of the observer call happening with
the deleted message as messageId.
