From cac0f8ec9e6c7a7cfeda58efb24d87e28be8aa38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 15:15:07 +0200
Subject: Prettify settings, rename some strings

---
 OpenKeychain/src/main/res/xml/experimental_preferences.xml |  9 +++++++++
 OpenKeychain/src/main/res/xml/preference_headers.xml       | 13 +++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/xml')

diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
index dbf19bddb..eb88e3ed9 100644
--- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -17,4 +17,13 @@
         android:persistent="false"
         android:summary="@string/label_experimental_settings_linked_identities_summary"
         android:title="@string/label_experimental_settings_linked_identities_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/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 4c40b9d1f..0c171467b 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -1,20 +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$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>
-- 
cgit v1.2.3