diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-06 15:26:22 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
| commit | 3034db0f71f9dd8e2f4d8838c1803952702f7520 (patch) | |
| tree | cb13212845cc5159516a2a0e87b0f3439acfc5ec /OpenKeychain/src/main/res/xml | |
| parent | f4f3a66d8c1d6a3b863eb7a7a6cb47a995609872 (diff) | |
| download | open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.gz open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.bz2 open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.zip | |
added proxy type
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/proxy_prefs.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index e77ac6d71..ab9c5a3e3 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -3,7 +3,7 @@ <CheckBoxPreference android:key="useTorProxy" android:persistent="true" - android:title="@string/pref_proxy_tor" + android:title="@string/pref_proxy_tor_label" android:summary="@string/pref_proxy_tor_summary" /> <CheckBoxPreference android:key="useNormalProxy" @@ -13,7 +13,7 @@ android:key="proxyHost" android:persistent="true" android:defaultValue="127.0.0.1" - android:title="@string/pref_proxy_host" + android:title="@string/pref_proxy_host_label" android:cursorVisible="true" android:textCursorDrawable="@null" android:inputType="textEmailAddress"/> @@ -21,7 +21,14 @@ android:key="proxyPort" android:defaultValue="8118" android:persistent="true" - android:title="@string/pref_proxy_port" + android:title="@string/pref_proxy_port_label" android:textCursorDrawable="@null" android:inputType="number" /> + <ListPreference + android:entries="@array/pref_proxy_type_entries" + android:entryValues="@array/pref_proxy_type_values" + android:defaultValue="@string/pref_proxy_type_value_http" + android:key="proxyType" + android:persistent="true" + android:title="@string/pref_proxy_type_label" /> </PreferenceScreen> |