OSDN Git Service

Integrate VPN with new keystore and misc fixes.
authorHung-ying Tyan <tyanh@google.com>
Mon, 6 Jul 2009 09:26:34 +0000 (17:26 +0800)
committerHung-ying Tyan <tyanh@google.com>
Mon, 6 Jul 2009 10:47:47 +0000 (18:47 +0800)
commit0a59b500147cc038541f6f2897de7e28c15a12c1
treef5d44650a99de7e5bc86933e8764d3d51c970da3
parenteb7836f11ec4e9753db7c6ecd9414e153bb7bdbe
Integrate VPN with new keystore and misc fixes.

* 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
res/layout/cstor_unlock_dialog_view.xml
res/values/strings.xml
src/com/android/settings/SecuritySettings.java
src/com/android/settings/vpn/L2tpEditor.java
src/com/android/settings/vpn/L2tpIpsecEditor.java
src/com/android/settings/vpn/L2tpIpsecPskEditor.java
src/com/android/settings/vpn/Util.java
src/com/android/settings/vpn/VpnEditor.java
src/com/android/settings/vpn/VpnProfileEditor.java
src/com/android/settings/vpn/VpnSettings.java