Apply the new keystore and certtool library in Wifi setting.
1. Certificate related APIs were moved to CertTool. Therefore, we have to migrate to CertTool instead. 2. Unlock the keystore if it is not unlocked yet(send the intent out to credential storage) for EAP access points. 3. Add Password field for WPA_EAP and IEEE8021X(this is for phase 2 auth.)
This commit is contained in:
@@ -66,7 +66,7 @@
|
||||
<LinearLayout android:id="@+id/enterprise_wrapper"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="8dip"
|
||||
android:padding="0dip"
|
||||
android:orientation="vertical">
|
||||
<TextView android:id="@+id/eap_text"
|
||||
style="?android:attr/textAppearanceSmallInverse"
|
||||
@@ -87,28 +87,6 @@
|
||||
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/ca_certificate_text"
|
||||
style="?android:attr/textAppearanceSmallInverse"
|
||||
android:layout_width="fill_parent"
|
||||
@@ -138,6 +116,28 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dip"
|
||||
android:singleLine="true" />
|
||||
<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" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Password -->
|
||||
|
Reference in New Issue
Block a user