diff options
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/account_desc.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/cloud_search_prefs.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/experimental_preferences.xml | 37 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/passphrase_preferences.xml (renamed from OpenKeychain/src/main/res/xml/adv_preferences.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 21 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/proxy_prefs.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 10 |
8 files changed, 79 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml index e04160c5c..942909dbe 100644 --- a/OpenKeychain/src/main/res/xml/account_desc.xml +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -2,5 +2,5 @@ <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" android:accountPreferences="@xml/account_preferences" android:accountType="@string/account_type" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" /> diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml index d14f0bc40..85d6a6bca 100644 --- a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml +++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <CheckBoxPreference + <SwitchPreference android:defaultValue="true" android:key="search_keyserver_pref" android:summary="@string/pref_keyserver_summary" @@ -12,7 +12,7 @@ android:persistent="false" android:title="@string/label_keyservers" /> - <CheckBoxPreference + <SwitchPreference android:defaultValue="true" android:key="search_keybase_pref" android:summary="@string/pref_keybase_summary" diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml new file mode 100644 index 000000000..ff1fa5a95 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml @@ -0,0 +1,37 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <Preference + android:persistent="false" + android:selectable="false" + android:title="@string/label_experimental_settings_desc_title" + android:summary="@string/label_experimental_settings_desc_summary" /> + + <SwitchPreference + android:defaultValue="false" + android:key="experimentalEnableWordConfirm" + android:persistent="false" + android:summary="@string/label_experimental_settings_word_confirm_summary" + android:title="@string/label_experimental_settings_word_confirm_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="experimentalEnableLinkedIdentities" + android:persistent="false" + android:summary="@string/label_experimental_settings_linked_identities_summary" + android:title="@string/label_experimental_settings_linked_identities_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="experimentalEnableKeybase" + android:persistent="false" + android:summary="@string/label_experimental_settings_keybase_summary" + android:title="@string/label_experimental_settings_keybase_title" /> + + <ListPreference + android:dialogTitle="@string/label_theme" + android:entries="@array/theme_entries" + android:entryValues="@array/theme_values" + android:key="theme" + android:persistent="false" + android:title="@string/label_theme" /> + +</PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml new file mode 100644 index 000000000..3923fae59 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" + android:contentAuthority="@string/provider_content_authority" + android:accountType="@string/account_type" + android:supportsUploading="false" + android:userVisible="true" + android:allowParallelSyncs="false" + android:isAlwaysSyncable="true" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml index 7dd649e5d..7dd649e5d 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index b7512b062..0c171467b 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,14 +1,29 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> <!--<header--> - <!--android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$GuiPrefsFragment"--> - <!--android:title="@string/section_gui" />--> + <!--android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$GuiPrefsFragment"--> + <!--android:title="@string/section_gui" />--> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment" + android:icon="@drawable/ic_cloud_black_24dp" + android:summary="Keyserver, keybase.io" android:title="@string/section_cloud_search" /> <header - android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$PassphrasePrefsFragment" + android:icon="@drawable/ic_lock_black_24dp" + android:summary="@string/section_passphrase_cache_summary" android:title="@string/section_passphrase_cache" /> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" + android:icon="@drawable/ic_settings_ethernet_black_24dp" + android:summary="@string/section_proxy_settings_summary" android:title="@string/section_proxy_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment" + android:icon="@drawable/ic_sync_black_24dp" + android:summary="@string/section_sync_settings_summary" + android:title="@string/section_sync_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment" + android:icon="@drawable/ic_extension_black_24dp" + android:title="@string/section_experimental_features" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index 94e101cb6..fbb83eb12 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <CheckBoxPreference + <SwitchPreference android:key="useTorProxy" android:persistent="true" android:title="@string/pref_proxy_tor_title" android:summary="@string/pref_proxy_tor_summary" /> - <CheckBoxPreference + <SwitchPreference android:key="useNormalProxy" android:persistent="true" android:title="@string/pref_proxy_normal_title" /> @@ -27,7 +27,7 @@ <ListPreference android:entries="@array/pref_proxy_type_entries" android:entryValues="@array/pref_proxy_type_values" - android:defaultValue="@string/pref_proxy_type_value_http" + android:defaultValue="proxyHttp" android:key="proxyType" android:persistent="true" android:title="@string/pref_proxy_type_title" /> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml new file mode 100644 index 000000000..de41ff030 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <SwitchPreference + android:key="syncKeyserver" + android:persistent="false" + android:title="@string/label_sync_settings_keyserver_title"/> + <SwitchPreference + android:key="syncContacts" + android:persistent="false" + android:title="@string/label_sync_settings_contacts_title" /> +</PreferenceScreen> |