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
70 lines
3.2 KiB
XML
70 lines
3.2 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.
|
|
-->
|
|
|
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content">
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:orientation="vertical"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"
|
|
android:padding="10dip">
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:orientation="horizontal"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content">
|
|
<TextView android:id="@+id/username_str"
|
|
android:layout_width="@dimen/vpn_connect_input_box_label_width"
|
|
android:layout_height="wrap_content"
|
|
android:textSize="@dimen/vpn_connect_normal_text_size"
|
|
android:gravity="right"
|
|
android:layout_marginRight="@dimen/vpn_connect_margin_right"
|
|
android:text="@string/vpn_username_colon" />
|
|
<EditText android:id="@+id/username_value"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:singleLine="True"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:orientation="horizontal"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content">
|
|
<TextView android:id="@+id/password_str"
|
|
android:layout_width="@dimen/vpn_connect_input_box_label_width"
|
|
android:layout_height="wrap_content"
|
|
android:textSize="@dimen/vpn_connect_normal_text_size"
|
|
android:gravity="right"
|
|
android:layout_marginRight="@dimen/vpn_connect_margin_right"
|
|
android:text="@string/vpn_password_colon" />
|
|
<EditText android:id="@+id/password_value"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:password="True"
|
|
android:singleLine="True"/>
|
|
</LinearLayout>
|
|
|
|
<CheckBox android:id="@+id/save_username"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="66dip"
|
|
android:text="@string/vpn_save_username" />
|
|
|
|
</LinearLayout>
|
|
</ScrollView>
|