Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
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-mr2
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
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
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.
Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-mr2
* commit '18517f50edcfebf41b61965b24e360858db1c5e4':
Import revised translations. DO NOT MERGE
Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-mr2
* commit '83e718f92710c766ef341fdde769b2efc489bef9':
Import revised translations. DO NOT MERGE
Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-mr2
* commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
Import revised translations. DO NOT MERGE
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-mr2
* 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-mr2
* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
b/2226832 Showing Pairing Dialog in the foreground
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2
* 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-mr2
* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '4d004e910732565ddd449c7c525f7d6cbd353392' into eclair-mr2
* commit '4d004e910732565ddd449c7c525f7d6cbd353392':
b/2238546 Fixed NPE in Settings when Bluetooth "class" is null
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-mr2
* commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a':
Import revised translations. DO NOT MERGE
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2
* commit '0cb3743e93aef81e7669f1e6c81184559e0f8154':
b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2
* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
Import revised translations. DO NOT MERGE
