Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'
* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
High-resolution (hdpi) artwork from TAT for Settings.
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'
* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7'
* commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7':
Cap the length of dictionary words to keep TextView from exploding.
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair
* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
cut number of frames in lock screen demo animation from 15 to 8
* changes:
1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom. Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.
see screen shots in http://b/2045023 for the differences.
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
Merge commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'
* commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
Remove link to Contributors. Fix for #2022496
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.
We also allow access to the VPN settings under the same circumstances.
Signed-off-by: Mike Lockwood <lockwood@android.com>
