Merge commit 'a06961dbacce690eab48076bc05ab59a7b2d938c'
* commit 'a06961dbacce690eab48076bc05ab59a7b2d938c':
Go to combined inbox from notification for 2+ accounts (#2147265)
Merge commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea' into eclair-mr2-plus-aosp
* commit 'd16b4b921fef0a79a12fd90a5fad353413ba80ea':
Go to combined inbox from notification for 2+ accounts (#2147265)
* The problem is that PendingIntents aren't updated when a notification
is updated, so the changed extras when a 2nd account gets a new message
aren't seen by MessageList when it's started up upon tapping the
notification (it uses the extras from the 1st account to get a new
message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
causes the extras in the PendingIntent to be updated
Change-Id: Ia4ab14954b2c1413526016975216b2516372f2aa
Merge commit '2c79dfdeaae0ba312fc7c15f134f55d6f3fd6075'
* commit '2c79dfdeaae0ba312fc7c15f134f55d6f3fd6075':
Add view of all counts in AccountFolderList
Merge commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4' into eclair-mr2-plus-aosp
* commit '3045bb967fa7bd88dc52c332cbeb7ffcd4252fe4':
Add view of all counts in AccountFolderList
Merge commit 'f265a1d21735a15e3707f7922110dd2f7eef8824'
* commit 'f265a1d21735a15e3707f7922110dd2f7eef8824':
Fix SQL for upgrade from ver 6 to ver 7 of Email database
Merge commit '367963639d4291511b7e175a208e2b553aac26c2' into eclair-mr2-plus-aosp
* commit '367963639d4291511b7e175a208e2b553aac26c2':
Fix SQL for upgrade from ver 6 to ver 7 of Email database
Merge commit 'ba78d18f59c73273739260e52d87b2ef8b81ab44' into eclair-mr2-plus-aosp
* commit 'ba78d18f59c73273739260e52d87b2ef8b81ab44':
Clean up appearance of unread counters
Merge commit 'dfeff3d8a71fafae24d55b7710966af06b177924'
* commit 'dfeff3d8a71fafae24d55b7710966af06b177924':
Handle case of moreAvailable true with no changes (#2189704)
Merge commit 'dc9bc35bb1adf4ef5deb4125eb0df0fef0c45dfc' into eclair-mr2-plus-aosp
* commit 'dc9bc35bb1adf4ef5deb4125eb0df0fef0c45dfc':
Handle case of moreAvailable true with no changes (#2189704)
* An Exchange log from Moto has shown sync behavior in which moreAvailable
is set to true even though there are no changes in the sync response
(i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
setting moreAvailable = false
Change-Id: Idef455f3e1170caf4002542ca432d128b3a19e56
Merge commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87' into eclair-mr2-plus-aosp
* commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87':
Clear out orphaned messages in updates/deletes tables
Case #1:
* Fixes#2184702
* Messages can be in the base Messages table, but also in
Message_Deletes and Message_Updates; the latter two were not
being purged of deleted messages.
* This CL deletes from all three tables when a Mailbox is deleted
* Also run a check for orphaned deletes/updates when the email
provider's db is first opened
* Unit test updated to check for proper deletion
* Unit test for the provider check for orphans
Case #2:
* Fixes#2184708
* Messages in Outbox/Drafts can get modified or deleted, but the
rows added to the updates/delete tables never get removed because
the boxes don't sync
* Added code to SyncManager.ping (which gets notifications of these
changes) to delete these rows
Change-Id: Ib53e441136b0da1e88bc220150d631999058a8f0
Merge commit '374c565e07ce32d7a6f8b0ac8516493d1ee5c64e'
* commit '374c565e07ce32d7a6f8b0ac8516493d1ee5c64e':
Fix the bug that the count of draft and trash icons are wrong.
Merge commit '3be8be105c46143b4307d62d7651af5fbf1cb4d6'
* commit '3be8be105c46143b4307d62d7651af5fbf1cb4d6':
Fix the apparance of title according to Gmail
Merge commit '9bb382f43aca0b9afd849e2faf7e5dd450722281' into eclair-mr2-plus-aosp
* commit '9bb382f43aca0b9afd849e2faf7e5dd450722281':
Fix the bug that the count of draft and trash icons are wrong.
Merge commit '7b16a280d9f0831868494e25559c6c0ac743575b' into eclair-mr2-plus-aosp
* commit '7b16a280d9f0831868494e25559c6c0ac743575b':
Fix the apparance of title according to Gmail
Merge commit '3c717848eae316d0b10940e2f84cb5b658cf531d'
* commit '3c717848eae316d0b10940e2f84cb5b658cf531d':
DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e' into eclair-mr2-plus-aosp
* commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e':
DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '53123c2f914db357fa5b4a8451b23c6be77314a5' into eclair-mr2
* commit '53123c2f914db357fa5b4a8451b23c6be77314a5':
DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '53123c2f914db357fa5b4a8451b23c6be77314a5' into eclair-plus-aosp
* commit '53123c2f914db357fa5b4a8451b23c6be77314a5':
DO NOT MERGE. Prevent duplication of POP3 attachments
* For each attachment we add, check the DB for an existing attachment
with similar metadata (name, mime type, content id, etc.)
* Skip adding them if already held
* Unit tests
Originally fixed in 5b0a12c199 / CL I036f39c6
Fixes bug http://b/2084704
