Merge commit '37aa27440bd3d73c9720252078b7507f5be480b1' into eclair-mr2-plus-aosp
* commit '37aa27440bd3d73c9720252078b7507f5be480b1':
MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '85d718cb0735de9069673fbf9834fa64459c2178' into eclair-mr2
* commit '85d718cb0735de9069673fbf9834fa64459c2178':
MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '25c7efc8eb496136b734349babf463f3edcc6edb' into eclair-mr2-plus-aosp
* commit '25c7efc8eb496136b734349babf463f3edcc6edb':
Use constants for elements in projections.
Merge commit '8b003de7adc059d87da3268b9e3a06bc68eabada' into eclair-mr2-plus-aosp
* commit '8b003de7adc059d87da3268b9e3a06bc68eabada':
MessageView: scroll to (0,0) on message change.
Merge commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441' into eclair-mr2
* commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441':
MessageView: scroll to (0,0) on message change.
Merge commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69' into eclair-mr2-plus-aosp
* commit 'c5abc6d636cff216ae1cb1e059ffc6d1ed4b3d69':
Avoid NPE at onRefresh in MessageList
Merge commit 'd493ba257a1632a8de578e06a7df7ed311227887' into eclair-mr2
* commit 'd493ba257a1632a8de578e06a7df7ed311227887':
Avoid NPE at onRefresh in MessageList
Merge commit 'fd883ca573724e1dc6973f7c43328d7dfd4caf8d' into eclair-mr2-plus-aosp
* commit 'fd883ca573724e1dc6973f7c43328d7dfd4caf8d':
Correct issue with mail change parsing (fixes#2165649)
Merge commit '8647be095a75a25df98487d6e908a94f2d6fb076' into eclair-mr2
* commit '8647be095a75a25df98487d6e908a94f2d6fb076':
Correct issue with mail change parsing (fixes#2165649)
* Older parsing code that didn't take into account the fact that
'flag' is a structured data item
* Requires Dr. No approval for Eclair_Sholes
Change-Id: Id1c0bc24e784b19c598d2b852975e135abebbdb0
Merge commit '5c63b5dde4508d85f91b69abfd126ab6e2d3e245' into eclair-mr2-plus-aosp
* commit '5c63b5dde4508d85f91b69abfd126ab6e2d3e245':
Handle change from push to other intervals properly (#2165032)
Merge commit '888ea64f86e518de18806ef85bc7c16ba29f72f6' into eclair-mr2
* commit '888ea64f86e518de18806ef85bc7c16ba29f72f6':
Handle change from push to other intervals properly (#2165032)
* It has been reported that messages for a particular user are not
staying in sync re: deletions via PC
* This hasn't been reported elsewhere
* The new logging command logs the subject of deleted messages which
will help track down the problem
* I have also requested, and expect to receive, an account on the
Moto server in question to try to replicate the issue
Requesting Dr. No approval for this important change to user logging
code.
Change-Id: I13229d843ef828b54f3514bdded5a7561a87989a
Merge commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190' into eclair-mr2
* commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190':
MessageCompose: allow sending email when started through external intent.
Merge commit '2787f001fb4b0341cc9949bffde62075b7c68b39' into eclair-mr2
* commit '2787f001fb4b0341cc9949bffde62075b7c68b39':
Import revised translations. DO NOT MERGE
* Unsafe (potentially stale) data was being written to the Mailbox table near
the end of each sync. It would effectively undo changes made to the
Mailbox in other threads that occurred while the Mailbox was syncing.
* In this particular case, changes to sync interval (push/ping/timed)
were being overwritten, which could cause push to get lost for as
long as 30 minutes (the pingLoop timeout when there aren't any
pingable mailboxes)
* Watchdog alarm was being set to wrong time (typo)
* Add extra user logging in case there are additional cases of push
* Only set sync status and time on successful sync
* Move ping error check into pingParser to avoid unnecessary sync
Change-Id: Icb4494078480ada39b7494b3abf380fb08858406
Merge commit 'f9ccc0ba88e00c4175f6720aca07876d50b9f22f' into eclair-plus-aosp
* commit 'f9ccc0ba88e00c4175f6720aca07876d50b9f22f':
Plumb send-message status callbacks from service
* Make sure service callbacks are installed
* Route from service sent-message callback to controller results
This sends the callback information back to listeners who care about
sent messages. Note, due to impedance mismatch between the service
and the controller, this should not be used for much more than an
indication that outbox status has changed.
Bug # 2158497
Change-Id: I8d013d97ef53dcca85216f9b8c027ba3917c1e85
* Removed obsolete "delete after 7 days" option from pop-up prefs
* Mark deleted message sentinels as "read" so they don't contribute
to unread counts.
Bug # 2157487 and Bug # 2159278
Change-Id: Ic3cbc51d6f5ede2eb923e2d0e5c0dfee377764f5
