d54bbd5193
Add a "domain" field that allows the user to specify a domain suffix match for an EAP network configuration. This field will only be available when the user specifies a CA certificate for an EAP-PEAP, EAP-TLS, or EAP-TTLS network. Under the hood, the value entered into this field will be passed to WPA supplicant as the |domain_suffix_match| configuration variable. BUG: 25180141 Change-Id: Ib69b9519f475e90e40441ddff61c80be43cf624b TEST: On angler, domain field appears for the EAP-PEAP, EAP-TLS TEST: and EAP-TTLS networks.
538 lines
26 KiB
XML
538 lines
26 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2010 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="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:fadeScrollbars="false">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:paddingBottom="8dip">
|
|
|
|
<LinearLayout android:id="@+id/info"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section" />
|
|
|
|
<LinearLayout android:id="@+id/type"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_ssid"
|
|
android:textDirection="locale" />
|
|
|
|
<EditText android:id="@+id/ssid"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:hint="@string/wifi_ssid_hint"
|
|
android:maxLength="32"
|
|
android:singleLine="true"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minEms="16"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_security" />
|
|
|
|
<Spinner android:id="@+id/security"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/wifi_security"
|
|
android:entries="@array/wifi_security" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/security_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout android:id="@+id/eap"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout android:id="@+id/l_method"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_method" />
|
|
|
|
<Spinner android:id="@+id/method"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/wifi_eap_method"
|
|
android:entries="@array/wifi_eap_method" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_phase2"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/please_select_phase2" />
|
|
|
|
<Spinner android:id="@+id/phase2"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/please_select_phase2"
|
|
android:entries="@array/wifi_phase2_entries" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_ca_cert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_ca_cert" />
|
|
|
|
<Spinner android:id="@+id/ca_cert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/wifi_eap_ca_cert" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/no_ca_cert_warning"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_warning"
|
|
android:text="@string/wifi_do_not_validate_eap_server_warning" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_domain"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_domain" />
|
|
|
|
<EditText android:id="@+id/domain"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_user_cert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_user_cert" />
|
|
|
|
<Spinner android:id="@+id/user_cert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/wifi_eap_user_cert" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_identity"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_identity" />
|
|
|
|
<EditText android:id="@+id/identity"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/l_anonymous"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_eap_anonymous" />
|
|
|
|
<EditText android:id="@+id/anonymous"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/password_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_password" />
|
|
|
|
<EditText android:id="@+id/password"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:password="true" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/show_password_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<!-- Dummy to enable right-justification of checkbox -->
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label" />
|
|
|
|
<CheckBox android:id="@+id/show_password"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:textSize="14sp"
|
|
android:text="@string/wifi_show_password" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/wifi_advanced_toggle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item"
|
|
android:visibility="gone">
|
|
<CheckBox android:id="@+id/wifi_advanced_togglebox"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_advanced_toggle"
|
|
android:text="@string/wifi_show_advanced" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/wifi_advanced_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout android:id="@+id/proxy_settings_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item"
|
|
android:visibility="gone">
|
|
|
|
<TextView android:id="@+id/proxy_settings_title"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/proxy_settings_title" />
|
|
|
|
<Spinner android:id="@+id/proxy_settings"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/proxy_settings_title"
|
|
android:entries="@array/wifi_proxy_settings" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/proxy_warning_limited_support"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item"
|
|
android:visibility="gone">
|
|
<!-- Dummy to enable right-justification of warning -->
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label" />
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:text="@string/proxy_warning_limited_support" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/proxy_pac_field"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item">
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/proxy_url_title" />
|
|
|
|
<EditText android:id="@+id/proxy_pac"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:hint="@string/proxy_url_hint"
|
|
android:inputType="textNoSuggestions"
|
|
android:singleLine="true"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
<LinearLayout android:id="@+id/proxy_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item">
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/proxy_hostname_label" />
|
|
|
|
<EditText android:id="@+id/proxy_hostname"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:hint="@string/proxy_hostname_hint"
|
|
android:inputType="textNoSuggestions"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item">
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/proxy_port_label" />
|
|
|
|
<EditText android:id="@+id/proxy_port"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:hint="@string/proxy_port_hint"
|
|
android:inputType="number"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item">
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/proxy_exclusionlist_label" />
|
|
|
|
<EditText android:id="@+id/proxy_exclusionlist"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:hint="@string/proxy_exclusionlist_hint"
|
|
android:inputType="textNoSuggestions"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/ip_fields"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item"
|
|
android:visibility="gone">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_ip_settings" />
|
|
|
|
<Spinner android:id="@+id/ip_settings"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_content"
|
|
android:prompt="@string/wifi_ip_settings"
|
|
android:entries="@array/wifi_ip_settings" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/staticip"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_section"
|
|
android:visibility="gone">
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_ip_address" />
|
|
|
|
<EditText android:id="@+id/ipaddress"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:hint="@string/wifi_ip_address_hint"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_gateway" />
|
|
|
|
<EditText android:id="@+id/gateway"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:hint="@string/wifi_gateway_hint"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_network_prefix_length" />
|
|
|
|
<EditText android:id="@+id/network_prefix_length"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:hint="@string/wifi_network_prefix_length_hint"
|
|
android:inputType="number" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_dns1" />
|
|
|
|
<EditText android:id="@+id/dns1"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:hint="@string/wifi_dns1_hint"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item" >
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_label"
|
|
android:text="@string/wifi_dns2" />
|
|
|
|
<EditText android:id="@+id/dns2"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
style="@style/wifi_item_edit_content"
|
|
android:singleLine="true"
|
|
android:hint="@string/wifi_dns2_hint"
|
|
android:inputType="textNoSuggestions" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</ScrollView>
|