- 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.
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
instead of two dots.
Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
profile.
Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
Merge commit '241610e986a8d2823f519762737903779089c253'
* commit '241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
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 '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
Merge commit 'd2e3b0139009b98be5ed825e58c38a325240594e'
* commit 'd2e3b0139009b98be5ed825e58c38a325240594e':
Edit second line of Search settings. First part of fix to bug1928620.
