Merge commit 'e13ff84df7877e447a33136e328813b3ee0e5140' into eclair-plus-aosp
* commit 'e13ff84df7877e447a33136e328813b3ee0e5140':
Fix leaked intent receiver by using onStartCommand in SyncManager
* Also remove some logging and correct some erroneous logging
* Fix the backoff behavior on IOException
Change-Id: I5fb5a0bf73eaa681eb7b9c305c838e78e7ba88ab
Merge commit '3c7f0d4c000f24e39fb4b0f1e10f762f5ff011c9' into eclair-plus-aosp
* commit '3c7f0d4c000f24e39fb4b0f1e10f762f5ff011c9':
Make exchange contact category names visible; also their members
Merge commit '013b84dab8d736da21e9103c686e2dbcc30657b7'
* commit '013b84dab8d736da21e9103c686e2dbcc30657b7':
Check for null data before writing contact rows to server
Merge commit '86ada729c2930c278c4f73a6bcea059c8ac74559' into eclair-plus-aosp
* commit '86ada729c2930c278c4f73a6bcea059c8ac74559':
Check for null data before writing contact rows to server
Merge commit 'be60dfdee7c2c0f73d54e1b04a36967508d428ae' into eclair-plus-aosp
* commit 'be60dfdee7c2c0f73d54e1b04a36967508d428ae':
Update MessageListView to fit punchcut's design
BUG:1904421
* update READ/UNREAD indications
** don't change color chip
** change background color
* Change Date
* Change the position of attachement icon
* Change menu icon for folder
Merge commit '51b635f2d2ff4d443a7e1d46be7394bf056b9f36' into eclair-plus-aosp
* commit '51b635f2d2ff4d443a7e1d46be7394bf056b9f36':
Fix spinny position in the title bar
* Edit Controller.deleteMessage() to handle both cases
* Refactored to start from processPendingActionsSynchronous() and
dispatch to series of smaller methods to handle deletes vs. updates
and the details of the various specific operations.
* Added processPendingDeletesSynchronous() which looks for delete-from-
trash and does the right thing locally and/or remotely.
Fixes bug # 1811026
Merge commit '6c6d7e3a260a5906afa3a0fbe9700a0b58046420' into eclair-plus-aosp
* commit '6c6d7e3a260a5906afa3a0fbe9700a0b58046420':
Fix sync-crashing bug in exchange contact groups
Merge commit '6c21942ec45f561d711b3d74ecca8e62afb735c4' into eclair-plus-aosp
* commit '6c21942ec45f561d711b3d74ecca8e62afb735c4':
Implement move-to-trash for IMAP and POP3.
* Define new message-loaded state "FLAG_LOADED_DELETED" (used only for
POP3, which needs to write sentinel messages that are not displayed.)
* Also renamed the other flags to make the naming more consistent.
* Tweak MessageList query generation to inhibit display of deleted
message sentinels, and MessagingController won't try to resync them.
* Clean up implementation of Controller.deleteMessage()
* Add support for move to trash to MessagingController. This operates
in three primary modes:
* POP3 local delete (no server-side interaction)
* POP3 server delete
* IMAP server delete (and copy to IMAP trash mailbox)
* Add missing implementation in provider to delete all of the attachments
for a given message
* Fix progress reporting in activities (the test for error vs. progress
was inverted, which caused progress indicators to keep spinning
after errors.)
* Fix broken account settings UI (POP3 delete policy was not persisting)
Addresses bug 2097409
TODO delete from trash / empty trash
Change-Id: I00188e6dc2093823106e009f35b68c760227c9e6
Merge commit '5c253ded23a18fc73a91787f0b7d82b9826240a3'
* commit '5c253ded23a18fc73a91787f0b7d82b9826240a3':
Change ping loop wait from 10s to 1s to reduce WakeLock use
Merge commit 'c522cfa77099bb8f65b65ad49b7781cf3bb86002' into eclair-plus-aosp
* commit 'c522cfa77099bb8f65b65ad49b7781cf3bb86002':
Change ping loop wait from 10s to 1s to reduce WakeLock use
* There is a better way of implementing this, which I'll write up in
Buganizer, but this will help our battery life testing
Change-Id: I2583f0cb9c62b38aee64166138385d7b14855832
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
