Merge commit 'fbb60a266d3e0fe7923617c2f8d4359cb9b76d49'
* commit 'fbb60a266d3e0fe7923617c2f8d4359cb9b76d49':
Remove the "unique" requirement for serverId; it should never have been there
Merge commit '9be10e62ed4c809c56e2bcc357d5bb7d5dd543c1' into eclair-plus-aosp
* commit '9be10e62ed4c809c56e2bcc357d5bb7d5dd543c1':
Remove the "unique" requirement for serverId; it should never have been there
* People using multiple accounts without this change could end up with missing folders
* Fixes 2099514
* Database version incremented; this change will cause a database wipe
Change-Id: I08d23fa54d8194758e1f7c2ffb528a14bc184f08
Merge commit 'cc6e0db2c6bef85cd54927950f1d9c57b2c3a786'
* commit 'cc6e0db2c6bef85cd54927950f1d9c57b2c3a786':
Fix crash related to long press of footer view in MessageList (2099784)
Merge commit '5768ef614bc7e45720da4ea2c92d261292993970' into eclair-plus-aosp
* commit '5768ef614bc7e45720da4ea2c92d261292993970':
Fix crash related to long press of footer view in MessageList (2099784)
- display "saved as draft" toast for save draft.
- don't display tost for send.
- don't cancel the sender task, let it complete.
- synchronize on mDraft although not sure that it's needed.
- fix the query for presence status.
- put it in an AsyncTask instead of Thread, remove from Handler.
- set the target rect when invoking the presence bar.
To improve functionality of next/prev buttons:
* Stop using managed query for next/prev cursor, so requery won't
run in UI thread. Add explicit lifecycle management.
* Requery on every onResume()
* Use a listener to catch external changes. This applies both to synced
changes and also local deletes.
* If we ever find ourselves out of the list, finish() immediately
to avoid any race conditions.
To reduce flicker & other problems during msg-to-msg navigation:
* Clear attachments list so it doesn't accrete as we navigate
* Clear body so we don't show previous body with newer headers
Fixes bug 2076472 and (possibly) 2069241 & 2078933
Merge commit 'd1d87b4dc9019d0a3ab9564f3d976eca339b8771'
* commit 'd1d87b4dc9019d0a3ab9564f3d976eca339b8771':
Put in temporary code to prevent contacts upsync based on Gservices setting
BUG: 2065601
* Show Unread Count of Accounts in AccountFolderList
* Change the background according to the folder's type
* Change the style of unread counts
TODO: Change background images of Unread Count
* Use concrete declarations, not the old sample code
* Remove unused "sample" code
* Create ExchangeSender.java
* Strip out the unused (old sample code) parts of ExchangeStore.java
* Unit test to make sure EAS is being offered
* Fix "account leak" in AccountSettingsTests
This was triggered by donut bug # 2092944 but the solution is
different because we support EAS here.
* Add reply columns to Body
* Remove a bunch of unused columns from Message
* Update SQL tables, content read/write, etc.
* Small tweaks to app code that was not-really-using the old columns.
* Update existing unit tests for new/changed columns
* Disable TagsTests to solve a tests failure (prexisting, not caused by
this CL)
Change-Id: Ief493796dfe219669755170d76786f91570cbb9b
Merge commit 'c78423aec13d034b8dc19951127fca0454730bf5' into eclair
* commit 'c78423aec13d034b8dc19951127fca0454730bf5':
DO NOT MERGE Remove Exchange setup option
This was leftover XML enabling the account setup UI. There is no
actual Exchange code in this branch, so it would create a "dead"
account with an always-empty inbox.
The actual change is to simply comment-out the XML entry that
was enabling the account setup option to be presented, and to add
a unit test to confirm the outcome in the UI.
Bug # 2092944
Merge commit '4bc201d9d0b939c11450270ed3ebda1e9341cb2b'
* commit '4bc201d9d0b939c11450270ed3ebda1e9341cb2b':
Use bulk delete for wiping contacts, now that it's implemented in ContactsProvider
