Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc'
* commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc':
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
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 '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2
* 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.
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 '8a8da556f3b9750263f3c447c88fa81bd50fe845'
* commit '8a8da556f3b9750263f3c447c88fa81bd50fe845':
Update to reflect new priorities for A2DP profile.
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.
(Google's open source screen reader) if they go
to the Accessibility settings screen and do not
have any accessibility tools installed.
This is a fix for bug #2250279
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
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 '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 '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2
* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
Don't restore old brightness when cancelling brightness dialog in automatic mode.
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.
Bug b/2015734
Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-mr2
* commit '62d3407de4a843cb83397fa757bc89653d78c800':
Minor change to use defined key rather than a string.
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2
* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
Use radio hunting time in addition to signal strength for cell standby computation. Fixes#2176141
