Merge commit 'def16a33334bbf2674f7016ae0fab0c679eb5ced'
* commit 'def16a33334bbf2674f7016ae0fab0c679eb5ced':
DO NOT MERGE disallow longpress in WebView
Merge commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795' into gingerbread-plus-aosp
* commit 'ebba88e4f4b3dd8001c6e1d2e4c1944aef613795':
DO NOT MERGE disallow longpress in WebView
Merge commit 'd414ba537266c539023a242784f5281846360b03'
* commit 'd414ba537266c539023a242784f5281846360b03':
DO NOT MERGE: Test validity of port numbers in account setup
Merge commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8' into gingerbread-plus-aosp
* commit 'd46952e7b0d47a4150d140502caf34e3a5276dd8':
DO NOT MERGE: Test validity of port numbers in account setup
Merge commit '2a6dbe456c120edc1a621a89cb93d063490f36b7'
* commit '2a6dbe456c120edc1a621a89cb93d063490f36b7':
DO NOT MERGE: Interpret "busy" on new events to mean "no response"
Merge commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b' into gingerbread-plus-aosp
* commit 'ccfc1c29c2f9fff7ee824d342bde1e5d7138722b':
DO NOT MERGE: Don't disable account box if sync freq -> "Never"
Merge commit '6f207f5df2a1b4190e5da243fd497dcf168899af' into gingerbread-plus-aosp
* commit '6f207f5df2a1b4190e5da243fd497dcf168899af':
DO NOT MERGE: Interpret "busy" on new events to mean "no response"
* The meaning of a busy status of "Busy" is uncertain; it could mean
"Accepted" or "Tentative", depending on whether the event was
created via OWA/Outlook or EAS
* We have interpreted it as "Accepted", which prevents the user from
actually accepting the event (as a state change is required for us
to send updates to the server/organizer)
* This CL changes the behavior such that a newly arriving event with
a "Busy" status is shown as "No response" in the Calendar, thereby
allowing the user to pick from any of the three possible options.
Bug: 2811859
Change-Id: I321f714e54e66ee8f40f5e2c00587b98bad71a63
* This gets very confused by the new text copy logic
* Downside is that copy from received message does not work at all
(it didn't work anyway).
* Will fix in next release by redesigning MessageView layout and no
longer wrapping in ScrollView
Bug: 2998892
Change-Id: Icd1219f3c45fd4da9259499e9c8a31ed0d3c4c30
Merge commit 'b2999edd996cb2ba2e12633e0309a16441d90188'
* commit 'b2999edd996cb2ba2e12633e0309a16441d90188':
DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.
Merge commit '723c21d0b0f972543bfdd3323096ab848ef2619d'
* commit '723c21d0b0f972543bfdd3323096ab848ef2619d':
DO NOT MERGE: Fix NPE in Controller and MessagingController.
Merge commit 'c6299fc0788afb9a066389f239cdfe630fc5c021' into gingerbread-plus-aosp
* commit 'c6299fc0788afb9a066389f239cdfe630fc5c021':
DO NOT MERGE: Fix ANR in one time initializer and unify BroadccastReceivers.
Merge commit 'b3eefca0e1c7fffe1b015e18050aee6867bfbcdd' into gingerbread-plus-aosp
* commit 'b3eefca0e1c7fffe1b015e18050aee6867bfbcdd':
DO NOT MERGE: Fix NPE in Controller and MessagingController.
- Merged all three BroadcastReceivers into one.
(Changed class name because old ones may have been disabled.)
- Use IntentService to perform the tasks in a worker thread.
Note the new receiver will never be disabled. We always need to start
exchange.SyncManager.
Bug 2722155
Bug 2416929
Backport of I8241880fc1ee38d85dcdca7e1d46fc2f6b2d375b
Change-Id: I9835cf86846d842e6f2d23014bc0912c3b888a05
Merge commit 'ea61437cf7717d194aa5cdc31b75147d681ef6ee'
* commit 'ea61437cf7717d194aa5cdc31b75147d681ef6ee':
DO NOT MERGE: Fix handling IOException in ImapStore
Merge commit '7bc1cee27814021df8b22d2099fe7e953bd36fac'
* commit '7bc1cee27814021df8b22d2099fe7e953bd36fac':
DO NOT MERGE: Test for interaction between ImapStore and vendor policy.
Merge commit '1251fd2ef389e43663c8520245315f37d2d2d3b1'
* commit '1251fd2ef389e43663c8520245315f37d2d2d3b1':
DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it.
Merge commit 'd693bda052964849b83f6cabc8cc2cb31b82c3d0'
* commit 'd693bda052964849b83f6cabc8cc2cb31b82c3d0':
DO NOT MERGE: Implement destroy() for all ImapElement classes.
Merge commit 'c24a42b5d8ba5fc03966648a76f529cc2f314001'
* commit 'c24a42b5d8ba5fc03966648a76f529cc2f314001':
DO NOT MERGE: Follow-up to the new IMAP parser.
Merge commit '0be6c7c5cf53d53ecd43f3ea51885c485525ccfb' into gingerbread-plus-aosp
* commit '0be6c7c5cf53d53ecd43f3ea51885c485525ccfb':
DO NOT MERGE: Fix handling IOException in ImapStore
Merge commit '75c6a611aa9a35a5d938ced3674e559bf47a1ddf' into gingerbread-plus-aosp
* commit '75c6a611aa9a35a5d938ced3674e559bf47a1ddf':
DO NOT MERGE: Test for interaction between ImapStore and vendor policy.
Merge commit '7fbdc44c580aa146cec1b91d60bf38e0df641c12' into gingerbread-plus-aosp
* commit '7fbdc44c580aa146cec1b91d60bf38e0df641c12':
DO NOT MERGE: Extract MockVendorPolicy, add standard mechanism to inject it.
Merge commit '2ef9710e0226aff64ad2772a511a57e9d6fe05ea' into gingerbread-plus-aosp
* commit '2ef9710e0226aff64ad2772a511a57e9d6fe05ea':
DO NOT MERGE: Implement destroy() for all ImapElement classes.
Merge commit '56d04724fe50562653ccd967db6268580e826352' into gingerbread-plus-aosp
* commit '56d04724fe50562653ccd967db6268580e826352':
DO NOT MERGE: Always destroy ImapResponses.
Merge commit '8c02a81722b23bb31f05f4753d6b044ced74c62c' into gingerbread-plus-aosp
* commit '8c02a81722b23bb31f05f4753d6b044ced74c62c':
DO NOT MERGE: Add TODOs to ImapStore.
Merge commit '415b27fbd3ef02d8a71b99b5f2ec0922a22c00f1' into gingerbread-plus-aosp
* commit '415b27fbd3ef02d8a71b99b5f2ec0922a22c00f1':
DO NOT MERGE: Follow-up to the new IMAP parser.