diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-07-07 14:29:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-07 14:29:12 -0700 |
| commit | 78c603747e04b50bdf9859cb97d1ae30c25dc03c (patch) | |
| tree | 7071963de00340cd6ad67e20225334a14313b9ba /res/layout | |
| parent | 722934dbbc9c3aca86d5827453afa9f7d4c7b87f (diff) | |
| parent | 413b171159cec5ad1e7b3cf4f1f842b5f2debc05 (diff) | |
| download | packages_apps_settings-78c603747e04b50bdf9859cb97d1ae30c25dc03c.zip packages_apps_settings-78c603747e04b50bdf9859cb97d1ae30c25dc03c.tar.gz packages_apps_settings-78c603747e04b50bdf9859cb97d1ae30c25dc03c.tar.bz2 | |
Merge "VpnSettings: pass certificates to racoon directly."
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/vpn_dialog.xml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml index a4bb216..ffbfd4d 100644 --- a/res/layout/vpn_dialog.xml +++ b/res/layout/vpn_dialog.xml @@ -20,7 +20,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="5mm"> + android:padding="3mm"> <LinearLayout android:id="@+id/editor" android:layout_width="match_parent" @@ -30,7 +30,7 @@ <TextView style="@style/vpn_label" android:text="@string/vpn_name"/> <EditText style="@style/vpn_value" android:id="@+id/name" - android:singleLine="true"/> + android:inputType="textCapWords"/> <TextView style="@style/vpn_label" android:text="@string/vpn_type"/> <Spinner style="@style/vpn_value" android:id="@+id/type" @@ -38,11 +38,11 @@ android:entries="@array/vpn_types"/> <TextView style="@style/vpn_label" android:text="@string/vpn_server"/> - <EditText style="@style/vpn_value" android:id="@+id/server" - android:singleLine="true"/> + <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" @@ -52,24 +52,27 @@ android:visibility="gone"> <TextView style="@style/vpn_label" android:text="@string/vpn_l2tp_secret"/> <EditText style="@style/vpn_value" android:id="@+id/l2tp_secret" - android:singleLine="true" android:password="true" android:hint="@string/vpn_not_used"/> </LinearLayout> - <LinearLayout android:id="@+id/ipsec_psk" + <LinearLayout android:id="@+id/ipsec_id" 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"/> <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier" - android:singleLine="true" 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:singleLine="true" android:password="true"/> </LinearLayout> @@ -111,15 +114,14 @@ android:visibility="gone"> <TextView style="@style/vpn_label" android:text="@string/vpn_username"/> - <EditText style="@style/vpn_value" android:id="@+id/username" - android:singleLine="true"/> + <EditText style="@style/vpn_value" android:id="@+id/username"/> <TextView style="@style/vpn_label" android:text="@string/vpn_password"/> <EditText style="@style/vpn_value" android:id="@+id/password" - android:singleLine="true" android:password="true"/> <CheckBox style="@style/vpn_value" android:id="@+id/save_login" + android:singleLine="false" android:text="@string/vpn_save_login"/> </LinearLayout> </LinearLayout> |