diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-06-26 14:24:50 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2009-06-26 14:24:50 +0800 |
| commit | e7565f3c48e6c90e65d9c15e33d20673a187c156 (patch) | |
| tree | b3f6dd9c2d8508faa0dc81d94b107cb2b32e9ce8 /res/xml | |
| parent | 386278a338d740dce95b7fa1514662b0eb5683e4 (diff) | |
| download | packages_apps_settings-e7565f3c48e6c90e65d9c15e33d20673a187c156.zip packages_apps_settings-e7565f3c48e6c90e65d9c15e33d20673a187c156.tar.gz packages_apps_settings-e7565f3c48e6c90e65d9c15e33d20673a187c156.tar.bz2 | |
Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
* 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
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/vpn_edit.xml | 5 | ||||
| -rw-r--r-- | res/xml/vpn_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/vpn_type.xml | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/res/xml/vpn_edit.xml b/res/xml/vpn_edit.xml index 7976242..a3cab9c 100644 --- a/res/xml/vpn_edit.xml +++ b/res/xml/vpn_edit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,10 +18,9 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> <EditTextPreference + android:key="vpn_name" android:title="@string/vpn_name" android:dialogTitle="@string/vpn_name" - android:key="vpn_name" - android:summary="@string/vpn_name_summary" android:singleLine="true"/> </PreferenceScreen> diff --git a/res/xml/vpn_settings.xml b/res/xml/vpn_settings.xml index a1a4bf9..773ae1c 100644 --- a/res/xml/vpn_settings.xml +++ b/res/xml/vpn_settings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/res/xml/vpn_type.xml b/res/xml/vpn_type.xml index c59b54a..fbc7822 100644 --- a/res/xml/vpn_type.xml +++ b/res/xml/vpn_type.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |