Merge commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp
* commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
audio settings or a dialog saying that you're not docked and you need to
buy a new dock from Google (kidding).
Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
Merge commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5' into eclair-plus-aosp
* commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5':
b/2367861 Auto connect if the user turns on BT while docked.
Merge commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp
* commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62':
Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/2367020 Enable bt profiles by default for car dock.
Merge commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp
* commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722':
b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
Merge commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp
* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
b/2318290 connect should be called instead of connect(profile) if device is unpaired.
Merge commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f' into eclair-plus-aosp
* commit '29d70e44e42946f7b78f950bad0c4b22c7d5cb5f':
b/2334482 Disable Music and audio by default for the docks
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp
* commit '052ad24219bbb170d9d028a460741524a768915a':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp
* commit '613549a622eac8278c9f81a1df83484c256652bf':
Fix desk dock getting stuck after unpairing.
Note: This is a workaround. The read problem is that
we are making a call to Bluez when it is not ready yet.
The interface has not been registered, so dbus call should fail.
We need to fix this properly.
Dr No: Eastham
Bug: 2317784
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-plus-aosp
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-plus-aosp
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
b/2314560 Prevent PIN dialog from showing up on undocked docks
