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
Merge commit '1b590566611017d95076ea7c4b36a5704219175a'
* commit '1b590566611017d95076ea7c4b36a5704219175a':
Email: check for closed cursor in onPostExecute for AsyncTasks.
Merge commit 'd39e34862a445e9a5ae4c4bc22098329418b5e3b'
* commit 'd39e34862a445e9a5ae4c4bc22098329418b5e3b':
Remove the temporary call to start SyncManager in Welcome.java
Merge commit '7266d90daccee82cb398356defb0c30d95a2ebdd'
* commit '7266d90daccee82cb398356defb0c30d95a2ebdd':
Make mailboxes respect the sync interval of the Account
Merge commit 'ebda78473223242ae0be4508a46dc60d2632b8ea'
* commit 'ebda78473223242ae0be4508a46dc60d2632b8ea':
Fix bugs related to Contacts sync behavior in Exchange
* Respect the UPLOAD extra from SyncManager and check for changes before starting
a sync.
* Failure to do this was causing looping behavior
Change-Id: Idfb1c35782b6d3771f9455c6fe86489572a871c5
Merge commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4'
* commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4':
High-resolution (hdpi) artwork from TAT for Email.
Merge commit 'bd4fe2db84afc7425cff536953faa4f912997736'
* commit 'bd4fe2db84afc7425cff536953faa4f912997736':
Fix upload of read state for Exchange emails
