0c1f89857a
1. Remove the isEnterprise() filter in Scanresult. 2. This requires the new fields such as identity, eap, certificate/key to support EAP authentication in Wifi Settings. 3. Add simple file-based keystore to select the cert/key from UI. -- Updated from the comments. -- Fix the bug for passing null pointer for adding spinner items.
183 lines
8.7 KiB
XML
183 lines
8.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="8dip"
|
|
android:orientation="vertical">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/table"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"
|
|
android:orientation="vertical">
|
|
</LinearLayout>
|
|
|
|
|
|
<!-- SSID -->
|
|
|
|
<TextView android:id="@+id/ssid_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/wifi_type_ssid" />
|
|
|
|
<EditText android:id="@+id/ssid_edit"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:singleLine="true" />
|
|
|
|
|
|
|
|
<!-- Security -->
|
|
|
|
<TextView android:id="@+id/security_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/wifi_security" />
|
|
|
|
<!-- The entries will be set programmatically -->
|
|
<Spinner android:id="@+id/security_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<!-- Enterprise Fields -->
|
|
<LinearLayout android:id="@+id/enterprise_wrapper"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="8dip"
|
|
android:orientation="vertical">
|
|
<TextView android:id="@+id/eap_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_select_eap" />
|
|
<Spinner android:id="@+id/eap_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
<TextView android:id="@+id/phase2_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_select_phase2" />
|
|
<Spinner android:id="@+id/phase2_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<TextView android:id="@+id/identity_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_type_identity" />
|
|
<EditText android:id="@+id/identity_edit"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:singleLine="true" />
|
|
<TextView android:id="@+id/anonymous_identity_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_type_anonymous_identity" />
|
|
<EditText android:id="@+id/anonymous_identity_edit"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:singleLine="true" />
|
|
<TextView android:id="@+id/client_certificate_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_select_client_certificate" />
|
|
<Spinner android:id="@+id/client_certificate_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
<TextView android:id="@+id/ca_certificate_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_select_ca_certificate" />
|
|
<Spinner android:id="@+id/ca_certificate_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
<TextView android:id="@+id/private_key_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_select_private_key" />
|
|
<Spinner android:id="@+id/private_key_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content" />
|
|
<TextView android:id="@+id/private_key_passwd_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_type_private_key_passwd" />
|
|
<EditText android:id="@+id/private_key_passwd_edit"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:singleLine="true" />
|
|
</LinearLayout>
|
|
|
|
<!-- Password -->
|
|
|
|
<TextView android:id="@+id/password_text"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dip"
|
|
android:text="@string/please_type_passphrase" />
|
|
|
|
<EditText android:id="@+id/password_edit"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:singleLine="true"
|
|
android:password="true" />
|
|
|
|
<CheckBox android:id="@+id/show_password_checkbox"
|
|
style="?android:attr/textAppearanceSmallInverse"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="2dip"
|
|
android:text="@string/wifi_show_password" />
|
|
|
|
<Spinner android:id="@+id/wep_type_spinner"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:entries="@array/wifi_wep_type" />
|
|
|
|
</LinearLayout>
|
|
|
|
</ScrollView>
|