diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-08-08 14:33:53 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-08-08 14:35:25 -0700 |
| commit | 6d4334be691815cd9615b0fdebb756999a9c06a3 (patch) | |
| tree | 4deda6580b09f1da75395cfedf1ddd617ba4ad9f /res/layout/vpn_dialog.xml | |
| parent | 14f6934fed64f296458ef0babffdc45398100a30 (diff) | |
| download | packages_apps_Settings-6d4334be691815cd9615b0fdebb756999a9c06a3.tar.gz packages_apps_Settings-6d4334be691815cd9615b0fdebb756999a9c06a3.tar.bz2 packages_apps_Settings-6d4334be691815cd9615b0fdebb756999a9c06a3.zip | |
VpnSettings: fix bugs.
1. Support identifier in L2TP/IPSec PSK.
2. Fix profile validation for IPSec Hybrid RSA.
3. Fix crash when the user does not want to initialize keystore.
Change-Id: Id46dbbc84915dfb69f8bab6b540426e7614ab7c6
Diffstat (limited to 'res/layout/vpn_dialog.xml')
| -rw-r--r-- | res/layout/vpn_dialog.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml index b4779e662..841e093b5 100644 --- a/res/layout/vpn_dialog.xml +++ b/res/layout/vpn_dialog.xml @@ -56,7 +56,7 @@ android:hint="@string/vpn_not_used"/> </LinearLayout> - <LinearLayout android:id="@+id/ipsec_id" + <LinearLayout android:id="@+id/ipsec_psk" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -64,13 +64,7 @@ <TextView style="@style/vpn_label" android:text="@string/vpn_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"/> <EditText style="@style/vpn_value" android:id="@+id/ipsec_secret" android:password="true"/> |