* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section
Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975'
* commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
Reduce the number of keystore connections to 1
Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'
* commit '38322393a6d029349ef4ef4f80757da175029bcb':
Reduce the number of keystore connections.
Merge commit '241610e986a8d2823f519762737903779089c253'
* commit '241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513'
* commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513':
Fix#1930767 : "Share with Google" not working on orientation change.
Merge commit '66959341a6b0891893d4c851be708c3073f61154'
* commit '66959341a6b0891893d4c851be708c3073f61154':
Fix behavior of cancelling the name cred. dialog.
Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'
* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
Integrate VPN with new keystore and misc fixes.
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
* Changes
+ Initial implementation of credential storage settings.
+ Use alert icon on delete and reconnect dialogs in VpnSettings.
(piggy-backed)
Patch Set 12:
+ Add password length and no-space verification.
+ Simplify dialog view xml files.
* Changes
+ Add L2tpActor, L2tpEditor, L2tpIpsecPskActor.
+ Make L2tpIpsecEditor extend L2tpEditor.
+ Revise the code for saving username. Make
VpnSettings.saveProfileToStorage() static.
+ Fix support for screen orientation change in both VpnSettings and
VpnEditor.
Patch Set 2:
+ Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead.
+ Remove unused imports. Wrap lines longer than 80 chars.
Patch Set 3:
+ Fix all the strings according to UI feedback.
+ Remove all the added actor subclasses and move password to editor.
+ Remove VPN entry in Security & location.
Patch Set 4:
+ Misc string fixes.
Patch Set 5:
+ Add strings for credential storage settings.
+ Changed the error dialog icon.
+ Fix "Remember me" indentation in connect dialog.
Patch Set 6:
+ resolve res/values/strings.xml
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
This is needed so we can correctly update the network location checkbox
if the network location provider is disabled because the user disagreed
to the terms of service in a dialog shown by the provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
LocationManagerService now listens for changes to settings,
making LocationManager.updateProviders() unnecessary.
Removed LocationManager.updateProviders()
Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
of enabling or disabling a single location provider.
This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
BUG=1729031
Automated import of CL 144372
