Merge commit '10a4908369c5dfd8db22e969fc00ce0ec695a065' into eclair-plus-aosp
* commit '10a4908369c5dfd8db22e969fc00ce0ec695a065':
Remove "Refresh" from bottom of EAS message lists
Merge commit 'd32d78634c776fa12afb7478fdc7e67140f2167e' into eclair-plus-aosp
* commit 'd32d78634c776fa12afb7478fdc7e67140f2167e':
Remember the list positions in MessageListView for onResume
Merge commit 'bce49bb3f56177eb61526426336fd0100ca34687' into eclair-plus-aosp
* commit 'bce49bb3f56177eb61526426336fd0100ca34687':
Harden a few calls in Controller
Merge commit '0d6e69ce8ac7e5d2ec508ec3223e9ed7c1174c8b' into eclair-plus-aosp
* commit '0d6e69ce8ac7e5d2ec508ec3223e9ed7c1174c8b':
Don't drop local mailboxes if we created them.
Reimplement a dropped snippet from the original MessagingController
that preserved locally-created special mailboxes (drafts, sent, etc.)
instead of dropping them when they were not found on the server.
Bug # 2078209
Merge commit 'af30d6cfacf0947d98ef1c9da2c5b5e06f7fc8f6' into eclair-plus-aosp
* commit 'af30d6cfacf0947d98ef1c9da2c5b5e06f7fc8f6':
Run sync threads in background priority (helps with #2126515)
Merge commit '1033fe606cfe7fa9f75b7c7f13868ec7df2ad993' into eclair-plus-aosp
* commit '1033fe606cfe7fa9f75b7c7f13868ec7df2ad993':
MessageCompose: correctly handle saving Draft in relation to restarting the activity on configuration change.
* Seems to improve UI responsiveness while doing large syncs,
but it can still slow down quite a bit
Change-Id: I539b8a9a96a922d810fba02ff4093759489a8153
Merge commit '7a59191bf1089ec2b89128406637c2094077cbce' into eclair-plus-aosp
* commit '7a59191bf1089ec2b89128406637c2094077cbce':
Fix loading the quoted text when editing draft.
Merge commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4' into eclair-plus-aosp
* commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4':
In EAS flow mode, don't try to use auto-setup (fixes#2143583)
Merge commit 'd66b465776261b3313c4b3bb3ef7c3954ebb08e4' into eclair-plus-aosp
* commit 'd66b465776261b3313c4b3bb3ef7c3954ebb08e4':
Fix loading the quoted text when editing draft.
Merge commit '0dbc15e6f15a01fdb2bd4f5263c06369299ec361' into eclair-plus-aosp
* commit '0dbc15e6f15a01fdb2bd4f5263c06369299ec361':
Email: catch RuntimeException when loading message with huge body from DB.
Merge commit 'b19bc4c0b6b96516870665cf0d4e5b45638c16f4' into eclair-plus-aosp
* commit 'b19bc4c0b6b96516870665cf0d4e5b45638c16f4':
Save HostAuth's when returning from editing Incoming/Outgoing settings
* in onActivityResult, we not only need to update the Account, but also
the relevant HostAuth (both if coming from AccountSetupExchange)
Change-Id: I0657ff257fe949e46e100eb3e6cfec6162514aa9
Merge commit 'cf19af4c742a03685a6e352b940f2b4c60457395' into eclair-plus-aosp
* commit 'cf19af4c742a03685a6e352b940f2b4c60457395':
Add more ping logging to detect odd looping behavior in Moto log
Merge commit '5fed93408390ba154f0c9d493e259caaa7a3c124' into eclair-plus-aosp
* commit '5fed93408390ba154f0c9d493e259caaa7a3c124':
Make sure we call setServicesEnabled in the BootReceiver
* Otherwise, there's a chance that various activities will be
disabled (like MessageCompose), even if there are existing
accounts.
* Enable BootReceiver by default
Change-Id: Id4669c41a846545d8bac5ad85736e1508074864a
Merge commit '3e1c871f049f13e433e8e5c4dd8ad789dd93c6c8' into eclair-plus-aosp
* commit '3e1c871f049f13e433e8e5c4dd8ad789dd93c6c8':
Fix EAS sending, which was inadvertently broken by a change in EmailProvider
* syncServerId in the Message table can now be NULL; this broke a test
used by EasOutboxService and SyncManager to determine whether there
were sendable messages in the Outbox
* Changed test to allow for NULL in syncServerId
Change-Id: Id76c7a45bc306abe7a927ab2395700f54a01a298
Merge commit '8cb81390ce808eb71ca6e1e26f8ea6eccba05e78' into eclair-plus-aosp
* commit '8cb81390ce808eb71ca6e1e26f8ea6eccba05e78':
Add a backgroud drawabled for fasttrack presence.
Merge commit '5fc57eccefeba517fe5e6f093786f37c6c4d50e6' into eclair-plus-aosp
* commit '5fc57eccefeba517fe5e6f093786f37c6c4d50e6':
Fix reply/forward for both SMTP and EAS; fixes#2138725
* Add new introText column in the Body database
* Reply/Forward put the appropriate String into this new column
* Rfc822Output uses this when required when streaming the message
Change-Id: I34602fdb3f91692c46fc8bc31ba0e6f680d445a0
Merge commit '0d00889f83fc8c1d69039a2c849b630fb4dd28dd' into eclair-plus-aosp
* commit '0d00889f83fc8c1d69039a2c849b630fb4dd28dd':
Cleanup Provider Message in preparation for upload
Merge commit '39ec429862545b622e166bb0d0a5cf0c1e0e019e' into eclair-plus-aosp
* commit '39ec429862545b622e166bb0d0a5cf0c1e0e019e':
Have SyncManager.ping check that the service is properly started
* If not, it will start the service
* This will catch cases in which the Email process has been killed
while alarms are set (this would be the vast majority of the time)
* Will look into ways of catching any remaining cases...
* Fixes#2131432
Change-Id: Id71e68d14b5d1b0402c866db49a07c7b1adf499d
