Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-mr2
* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-plus-aosp
* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032'
* commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324'
* commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Merge commit '2ffa95fd591424ae87337078ead9693b716a9873' into eclair-mr2-plus-aosp
* commit '2ffa95fd591424ae87337078ead9693b716a9873':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '87985ae6de00f4001f957d7a27004843872a7e2a' into eclair-mr2-plus-aosp
* commit '87985ae6de00f4001f957d7a27004843872a7e2a':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-mr2
* commit '3327f7887328c55ef2d837a8e2a07cea2070c744':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
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 '36305d01f2998396b9c49b02f6c35c76d417a048'
* commit '36305d01f2998396b9c49b02f6c35c76d417a048':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc'
* commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc':
Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'f74e344df00da63e866182cad7b6fe1cd372e779' into eclair-mr2-plus-aosp
* commit 'f74e344df00da63e866182cad7b6fe1cd372e779':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-mr2
* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-plus-aosp
* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit '1a8cb120b1a2a4df0d23831c3482a545f284ca86' into eclair-mr2-plus-aosp
* commit '1a8cb120b1a2a4df0d23831c3482a545f284ca86':
Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
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 'e5142b7f61bdb88167cdd5877ea17dd488104814' into eclair-mr2-plus-aosp
* commit 'e5142b7f61bdb88167cdd5877ea17dd488104814':
Import revised translations. DO NOT MERGE
Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-plus-aosp
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-mr2
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
Merge commit '379953def17d6aec7a07a01a7d337403c63bdf44' into eclair-mr2-plus-aosp
* commit '379953def17d6aec7a07a01a7d337403c63bdf44':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit 'a8eae3f387380b8270e259284b3944b8d0388573'
* commit 'a8eae3f387380b8270e259284b3944b8d0388573':
Missing Forget button after doing Add Network on an AP in the scanned list
Merge commit 'fe0540c26d661eb56e7693e47189039326e19f72'
* commit 'fe0540c26d661eb56e7693e47189039326e19f72':
Change priority for Headset profile on the same lines as A2DP profile.
Merge commit '42b78b6b4cca4b1b4a6dbd2cdc75d02ea2821d6a' into eclair-mr2-plus-aosp
* commit '42b78b6b4cca4b1b4a6dbd2cdc75d02ea2821d6a':
Import revised translations. DO NOT MERGE
Merge commit '60e5714311f4ec6d0135397b2beeb5dd511cf318' into eclair-mr2-plus-aosp
* commit '60e5714311f4ec6d0135397b2beeb5dd511cf318':
Missing Forget button after doing Add Network on an AP in the scanned list
Merge commit '6c01d1305e5c9c7434f4573872c94937a2b3957a' into eclair-mr2-plus-aosp
* commit '6c01d1305e5c9c7434f4573872c94937a2b3957a':
Change priority for Headset profile on the same lines as A2DP profile.
Merge commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-mr2
* commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7':
Import revised translations. DO NOT MERGE
Problem:
On the Wifi Settings screen, if instead of clicking on the AP shown on the scanned list, we do an "Add Wi-Fi network" and enter the AP information - the AP information gets stored and the client device connects to the AP. Afterwards, if we click on the AP again the "Forget" button does not appear until we exit the Wifi Settings screen and return.
Root cause and Fix:
mApScanList in WifiLayer tracks the list of APs shown. Upon doing a connect through a direct click, the configured state for the AP in the list updated. However, if we do an Add Network, the configured state on mApScanList remains unupdated. This causes the Settings screen to not show "Forget" for the AP when it is clicked.
The fix is to set the Configured state to true in handleSave() by fetching the AP state stored in WifiLayer.
Bug: 2296038
Change-id: I70c545905a4984a03a0f235f3baf17cd36688710
Merge commit '179a7d76ea1921099d012bda6f373e7765abbcdd'
* commit '179a7d76ea1921099d012bda6f373e7765abbcdd':
Switched Settings to use the new Gmail permission name space
Merge commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-plus-aosp
* commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7':
Import revised translations. DO NOT MERGE
Merge commit '4cb03801ebb4ce3c4f1b2d770f1033677446d6ca' into eclair-mr2-plus-aosp
* commit '4cb03801ebb4ce3c4f1b2d770f1033677446d6ca':
Switched Settings to use the new Gmail permission name space
