unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt
Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
Merge commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96' into eclair-plus-aosp
* commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96':
Fix#2377870 : NPE in Dock settings
Merge commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp
* commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
If the Dock settings is launched after reboot but before it is docked,
the settings screen crashes because the dock status is not available.
This fixes the case where there was never a pending intent for dock status.
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.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.
Related bug: 2053751
Merge commit '213c35c052375632487469c88227883ff1a0f1ac'
* commit '213c35c052375632487469c88227883ff1a0f1ac':
Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
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 'd69a5ee28cb5164233805a751a7c3deafba58668'
* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
b/2367020 Enable bt profiles by default for car dock.
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp
* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
b/2367020 Enable bt profiles by default for car dock.
Merge commit '79270566b178ed7efc1c62f8410822d46d6e3152'
* commit '79270566b178ed7efc1c62f8410822d46d6e3152':
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 '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
Previously it was using America/Araguaina, which does not currently observe
DST. Brasilia is actually in an area that follows the Sao_Paulo rules.
Bug 2362824
Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c'
* commit 'd638a7cb0841184349edbec2c995a36e5719cb8c':
b/2335545 Revert the dock strings back to "For Music and Media"
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
