e7565f3c48
* 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
37 lines
1.5 KiB
XML
37 lines
1.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- 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.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:title="@string/vpn_settings_activity_title">
|
|
|
|
<PreferenceScreen android:key="add_new_vpn"
|
|
android:title="@string/vpn_add_new_vpn">
|
|
<!--intent
|
|
android:action="android.intent.action.MAIN"
|
|
android:targetPackage="com.android.settings.vpn"
|
|
android:targetClass="com.android.settings.vpn.VpnEditor" /-->
|
|
</PreferenceScreen>
|
|
|
|
<!--CheckBoxPreference android:key="installer_enabled"
|
|
android:defaultValue="false"
|
|
android:title="@string/installer_enabled"
|
|
android:summaryOn="@string/installer_enabled_summary_on"
|
|
android:summaryOff="@string/installer_enabled_summary_off" /-->
|
|
|
|
<PreferenceCategory android:key="vpn_list" android:title="@string/vpns">
|
|
</PreferenceCategory>
|
|
</PreferenceScreen>
|