0c1abce1a6
This CL updates Settings for IKEv2/IPsec Platform VPN profiles. Platform VPN profiles currently configure DNS and routes based on the configuration received from the server. As such, these parameters are not required to start an always-on VPN. Similarly, a numeric server address is not required, as the IKEv2 library will do the DNS resolution based on the current Network. This has the nice property of allowing the VPN to run with IPv4 or IPv6 outer addresses (as opposed to LegacyVpn, which runs only in IPv4) Lastly, this always allows configuration of the IKEv2 local identifier, whether MSCHAPv2, RSA or PSK authentication is used. Bug: 148991741 Test: Compiles, manually tested. Change-Id: Ib1049fdc602e349bb0d24de536767a6e15adf194
231 lines
10 KiB
XML
231 lines
10 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2011 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="match_parent"
|
|
android:layout_height="wrap_content">
|
|
<LinearLayout android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:padding="24dp">
|
|
|
|
<LinearLayout android:id="@+id/editor"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_name"
|
|
android:labelFor="@+id/name"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/name"
|
|
android:inputType="textCapWords"/>
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_type"
|
|
android:labelFor="@+id/type"/>
|
|
<Spinner style="@style/vpn_value"
|
|
android:id="@+id/type"
|
|
android:prompt="@string/vpn_type"
|
|
android:entries="@array/vpn_types"/>
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_server"
|
|
android:labelFor="@+id/server"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/server"/>
|
|
|
|
<CheckBox style="@style/vpn_value" android:id="@+id/mppe"
|
|
android:text="@string/vpn_mppe"
|
|
android:singleLine="false"
|
|
android:visibility="gone"/>
|
|
|
|
<LinearLayout android:id="@+id/l2tp"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_l2tp_secret"
|
|
android:labelFor="@+id/l2tp_secret"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/l2tp_secret"
|
|
android:password="true"
|
|
android:hint="@string/vpn_not_used"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/options_ipsec_identity"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_ipsec_identifier"
|
|
android:labelFor="@+id/ipsec_identifier"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier"
|
|
android:hint="@string/vpn_not_used"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ipsec_psk"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_ipsec_secret"
|
|
android:labelFor="@+id/ipsec_secret"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/ipsec_secret"
|
|
android:password="true"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ipsec_user"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_ipsec_user_cert"
|
|
android:labelFor="@+id/ipsec_user_cert"/>
|
|
<Spinner style="@style/vpn_value" android:id="@+id/ipsec_user_cert"
|
|
android:prompt="@string/vpn_ipsec_user_cert" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ipsec_peer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_ipsec_ca_cert"
|
|
android:labelFor="@+id/ipsec_ca_cert"/>
|
|
<Spinner style="@style/vpn_value" android:id="@+id/ipsec_ca_cert"
|
|
android:prompt="@string/vpn_ipsec_ca_cert" />
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_ipsec_server_cert"
|
|
android:labelFor="@+id/ipsec_server_cert"/>
|
|
<Spinner style="@style/vpn_value" android:id="@+id/ipsec_server_cert"
|
|
android:prompt="@string/vpn_ipsec_server_cert" />
|
|
</LinearLayout>
|
|
|
|
<CheckBox style="@style/vpn_value" android:id="@+id/show_options"
|
|
android:singleLine="false"
|
|
android:text="@string/vpn_show_options"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/options"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
<LinearLayout android:id="@+id/network_options"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_search_domains"
|
|
android:labelFor="@+id/search_domains"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/search_domains"
|
|
android:hint="@string/vpn_not_used"/>
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_dns_servers"
|
|
android:labelFor="@+id/dns_servers"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/dns_servers"
|
|
android:hint="@string/vpn_not_used"/>
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_routes"
|
|
android:labelFor="@+id/routes"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/routes"
|
|
android:hint="@string/vpn_not_used"/>
|
|
</LinearLayout>
|
|
|
|
<TextView android:id="@+id/vpn_proxy_settings_title"
|
|
style="@style/vpn_label"
|
|
android:text="@string/proxy_settings_title"
|
|
android:labelFor="@+id/vpn_proxy_settings" />
|
|
|
|
<Spinner android:id="@+id/vpn_proxy_settings"
|
|
style="@style/vpn_value"
|
|
android:prompt="@string/proxy_settings_title"
|
|
android:entries="@array/vpn_proxy_settings" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/vpn_proxy_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone" >
|
|
|
|
<TextView
|
|
style="@style/vpn_label"
|
|
android:text="@string/proxy_hostname_label"
|
|
android:labelFor="@+id/vpn_proxy_host" />
|
|
|
|
<EditText
|
|
android:id="@+id/vpn_proxy_host"
|
|
style="@style/vpn_value"
|
|
android:hint="@string/proxy_hostname_hint"
|
|
android:inputType="textNoSuggestions" />
|
|
|
|
<TextView
|
|
style="@style/vpn_label"
|
|
android:text="@string/proxy_port_label"
|
|
android:labelFor="@+id/vpn_proxy_port" />
|
|
|
|
<EditText
|
|
android:id="@+id/vpn_proxy_port"
|
|
style="@style/vpn_value"
|
|
android:hint="@string/proxy_port_hint"
|
|
android:inputType="number" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/userpass"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_username"
|
|
android:labelFor="@+id/username"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/username"/>
|
|
|
|
<TextView style="@style/vpn_label"
|
|
android:text="@string/vpn_password"
|
|
android:labelFor="@+id/password"/>
|
|
<EditText style="@style/vpn_value" android:id="@+id/password"
|
|
android:password="true"/>
|
|
|
|
<CheckBox style="@style/vpn_value" android:id="@+id/save_login"
|
|
android:singleLine="false"
|
|
android:text="@string/vpn_save_login"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/connect"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:animateLayoutChanges="true">
|
|
<CheckBox style="@style/vpn_value" android:id="@+id/always_on_vpn"
|
|
android:singleLine="false"
|
|
android:text="@string/vpn_menu_lockdown"/>
|
|
<TextView style="@style/vpn_warning" android:id="@+id/always_on_invalid_reason"
|
|
android:singleLine="false"
|
|
android:visibility="gone"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</ScrollView>
|