diff options
| author | schwabe <none@none> | 2012-04-29 16:05:44 +0200 |
|---|---|---|
| committer | schwabe <none@none> | 2012-04-29 16:05:44 +0200 |
| commit | 82327ec0b9929d6459d7a7f099b25dfca2bd6480 (patch) | |
| tree | e3c5d76eb4b2b10cdeefbadedb6e524e369e79f6 /res | |
| parent | 710abdcdcac0bb18ed58f87bee047c0371c152f0 (diff) | |
Version 0.4 had a User/password and static keys options that will not work. Fix that
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml | 47 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 26 insertions, 22 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index f6673491..37d2c733 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -33,11 +33,7 @@ <EditText android:id="@+id/profilename" style="@style/item" - android:inputType="text" - /> - - - + android:inputType="text" /> <TextView style="@style/item" @@ -52,7 +48,7 @@ <!-- <requestFocus /> --> </EditText> - + <TextView style="@style/item" android:text="@string/port" @@ -113,7 +109,7 @@ </LinearLayout> <LinearLayout - android:id="@+id/certs" + android:id="@+id/cacert" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -124,6 +120,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" blinkt:title="@string/ca_title" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/certs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone" > <de.blinkt.openvpn.FileSelectLayout android:id="@+id/certselect" @@ -166,56 +170,55 @@ android:inputType="textPassword" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/userpassword" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:visibility="gone" > - - <TextView + + <TextView style="@style/item" android:layout_marginLeft="8dip" android:layout_marginRight="8dip" android:text="@string/auth_username" android:textAppearance="?android:attr/textAppearanceSmall" /> - <EditText android:id="@+id/auth_username" style="@style/item" android:layout_marginLeft="8dip" android:layout_marginRight="8dip" - android:inputType="textNoSuggestions" /> - <TextView + android:inputType="textNoSuggestions" /> + + <TextView style="@style/item" android:layout_marginLeft="8dip" android:layout_marginRight="8dip" android:text="@string/auth_pwquery" android:textAppearance="?android:attr/textAppearanceSmall" /> - <EditText android:id="@+id/auth_password" style="@style/item" android:layout_marginLeft="8dip" android:layout_marginRight="8dip" android:inputType="textPassword" /> -</LinearLayout> + <!-- android:hint="@string/pw_query_hint" --> + </LinearLayout> + <LinearLayout android:id="@+id/statickeys" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:visibility="gone" > - <TextView android:text="@string/static_keys_info" - style="@style/item"/> - </LinearLayout> - - - - + <TextView + style="@style/item" + android:singleLine="false" + android:text="@string/static_keys_info" /> + </LinearLayout> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a837840e..2a2135a3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -103,4 +103,5 @@ <string name="config_error_message">An error has been found in your VPN configuration:</string> <string name="ipv4_format_error">Cannot parse the IPv4 address</string> <string name="custom_route_format_error">Cannot parse the custom routes</string> + <string name="pw_query_hint">Leave empty to query on demand</string> </resources> |