Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/2296110 Dialog for setting up dock audio.
Reimplemented as a Foreground Service just so it can get on top of the Car Dock App.
Added debounce mechanism to not disconnect immediately after getting a undock event.
Each dock now has its own "Remember setting".
Remember Settings is on by default
Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-plus-aosp
* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-plus-aosp
* commit '3327f7887328c55ef2d837a8e2a07cea2070c744':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-plus-aosp
* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.
When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.
Change priority for Headset profile on the same lines as A2DP profile.
AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.
Dr no: Eastham
Bug: 2133530
This inserts a launcher for the Dock settings dialog, if the
device supports it and is currently docked.
The menu item disappears if the phone is not docked in the car/desk dock.
Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-plus-aosp
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-plus-aosp
* commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7':
Import revised translations. DO NOT MERGE
Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-plus-aosp
* commit '18517f50edcfebf41b61965b24e360858db1c5e4':
Import revised translations. DO NOT MERGE
Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-plus-aosp
* commit '83e718f92710c766ef341fdde769b2efc489bef9':
Import revised translations. DO NOT MERGE
Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-plus-aosp
* commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
Import revised translations. DO NOT MERGE
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-plus-aosp
* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
Fix for NPE in #2248683
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-plus-aosp
* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/2226832 Showing Pairing Dialog in the foreground
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp
* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
Updated icons for Settings. DO NOT MERGE
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery. Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp
* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-plus-aosp
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
