Merge commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b'
* commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b':
Add translated time zone picker lists for several more languages.
Merge commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2'
* commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2':
wifi: use new WifiManager.startScanActive() method to trigger scans.
Merge commit 'e02f206e1161fc2d332db60395e74cca397ffa27'
* commit 'e02f206e1161fc2d332db60395e74cca397ffa27':
Focus the password box when username is saved.
Merge commit '66959341a6b0891893d4c851be708c3073f61154'
* commit '66959341a6b0891893d4c851be708c3073f61154':
Fix behavior of cancelling the name cred. dialog.
Merge commit 'f96fb705f5b63177a79379b68dde307105b46f21'
* commit 'f96fb705f5b63177a79379b68dde307105b46f21':
In the TTS settings: rely on the default locale rather than default
* changes:
In the TTS settings: rely on the default locale rather than default values stored in TextToSpeech.Engine to initialize the default TTS country and variant.
Merge commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da'
* commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da':
Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
Merge commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f'
* commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f':
String fixes for the credential storage and vpn settings.
* Changes
+ Shorten the messages for both set-password and enter-password dialogs
when other activities access the credential storage.
Patch Set 2:
+ Fix the capital issue in the vpn error messages.
+ Add separate strings for terms used in the error messages.
+ Modify related src files that use those terms.
Merge commit '879f7bcf41782940fff3ffcb3586d606361360c6'
* commit '879f7bcf41782940fff3ffcb3586d606361360c6':
Fix bug 1946195 by making use of the current Locale to set a default value
* changes:
Fix bug 1946195 by making use of the current Locale to set a default value in the language pref list (bug was no selection in the default language list). Fix half of bug 1956707 where speech rate value as read from the settings was translated to a ratio, which applied an improper speech rate on the TTS engine (bug was setting a default rate makes the TTS demo unintelligible). Moved logic to set the default value in the language pref list in a separate private method to improve readability. Changed default rate values so that normal is 1x and the fastest is 2x.
in the language pref list (bug was no selection in the default language list).
Fix half of bug 1956707 where speech rate value as read from the settings
was translated to a ratio, which applied an improper speech rate on the
TTS engine (bug was setting a default rate makes the TTS demo unintelligible).
Moved logic to set the default value in the language pref list in a separate
private method to improve readability.
Changed default rate values so that normal is 1x and the fastest is 2x.
Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'
* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
Integrate VPN with new keystore and misc fixes.
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'
* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
Apply the new keystore and certtool library in Wifi setting.
Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'
* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
Add certificate to keystore for the ADD intent
* Changes
+ Pass intent to keystore when needed and hooks to resume from it.
+ Generate random, unique ID for profile instead of base64 from its
name.
+ Add VPN to "Wirless controls" description.
+ Add credential storage to "Security & location" description.
+ More hints to set password and unlock dialogs in credential storage
settings for actions that come from other processes.
+ Sort VPN profiles according to the names.
+ Replace Keystore with CertTool in L2tpIpsecEditor
1. Certificate related APIs were moved to CertTool. Therefore,
we have to migrate to CertTool instead.
2. Unlock the keystore if it is not unlocked yet(send the intent
out to credential storage) for EAP access points.
3. Add Password field for WPA_EAP and IEEE8021X(this is for
phase 2 auth.)
