Merge commit 'aec13abacebf0701138b34adce9b21459ede6de5' into eclair-mr2-plus-aosp
* commit 'aec13abacebf0701138b34adce9b21459ede6de5':
Import revised translations. DO NOT MERGE
Merge commit '14d3745f9556232da05c9cd319c097a3e6f791b5' into eclair-mr2
* commit '14d3745f9556232da05c9cd319c097a3e6f791b5':
Import revised translations. DO NOT MERGE
Merge commit '052eefe406c7cedad65ed497f2f1137a1a210a42' into eclair-mr2-plus-aosp
* commit '052eefe406c7cedad65ed497f2f1137a1a210a42':
changed to use the new EntityIterator interface
Merge commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b' into eclair-mr2-plus-aosp
* commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b':
Don't delete referenced messages from the Exchange server
Merge commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e' into eclair-mr2-plus-aosp
* commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e':
Ensure that service calls run outside the UI thread (#2235734)
Merge commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f' into eclair-mr2-plus-aosp
* commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f':
DO NOT MERGE. Improve colors of read/unread messages.
* Addresses #2287439 incompletely
* The most likely reason for a reply/forward to get stuck in the Outbox
is that the referenced message has been deleted from the client, with
the deletion occuring BEFORE the message gets sent (currently, the two
are completely independent)
* This change causes deletes NOT to be sent to the server if the message
to be deleted is referenced by an outgoing message
Change-Id: I146f63ab345c07e684790e1d7d1fc08870468bbf
* Addresses #2226426
* If the user deletes Email data, or if data corruption causes
EmailProvider.db to be deleted, we will be in an inconsistent
state with any existing Exchange accounts, since the AccountManager
will still know about them, contacts (and eventually calendar) items will
continue to exist, etc.
* Run an integrity check when the provider is created, deleting any
orphaned EmailProvider.db or EmailProviderBody.db
* Catch SQLiteException's in the Provider and do an integrity check
if any is caught
Change-Id: I47d523b90a6b8f71ba8e13fba4b04846b3da1b1d
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-mr2
* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
DO NOT MERGE. Improve colors of read/unread messages.
Backport of 47da97527b547da97527b5bbecba972e0c6a5d382cd7b0768e9.
Original comment:
Improve visible difference between read and unread messages
BUG: 2168155
turns out the change I submitted before is not required at all. I mistakenly
assumed sqlite wouldn't be able to handle it. but tested it with the latest
version of sqlite 3.6.20. the old style triggers work fine.
* When a mailbox sync is stopped intentionally (for example, if account
settings change), we report a connection error by mistake
* Handle this case properly, reporting "success" (i.e. no error state)
* Remove obsolete comment
Change-Id: I9bec1244267cd2240c369b9b7f905948381a0f91
Merge commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34' into eclair-mr2-plus-aosp
* commit '3d32f5621734bc9698ac1d5892d6ee58ffd98c34':
Import revised translations. DO NOT MERGE
This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-mr2
* commit '5905791775e7e431135bda21969b9e5efd24de62':
Import revised translations. DO NOT MERGE
Merge commit '98796942eab3215eb1c3c8486a65a152e8cee516' into eclair-mr2-plus-aosp
* commit '98796942eab3215eb1c3c8486a65a152e8cee516':
change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
Merge commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df' into eclair-mr2-plus-aosp
* commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df':
Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-mr2
* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
Import revised translations. DO NOT MERGE
Merge commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4' into eclair-mr2-plus-aosp
* commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4':
Save the state of checkboxes when orientation is changed
Merge commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665' into eclair-mr2-plus-aosp
* commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665':
Fix improper constant to allow retry for sending Exchange mail
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-mr2
* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
Fix improper constant to allow retry for sending Exchange mail
* Related to MR1 triaged bug 2274389 in which mail was stuck in the
Outbox and wouldn't send
* It turns out an improper constant was being used in the SQL code
for turning off the "error" state flag
Change-Id: Ic1a2e5b9dd34ec3f9d7da0b3d2cd63d77bb7681e
* The "send outgoing messages" button doesn't work in the combined
inbox (the case wasn't handled)
* Add code to loop through accounts, calling the Controller for each
in this case
* Fixes (partially or completely) #2274389
Change-Id: I94e984247d43f93a4d6546b8c10f6ce149b091be
