From 1ef6f883e34a08dc916ad7dfabd7f892964aff54 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 27 Jul 2015 14:10:26 +0530
Subject: introduced keyserver sync adapter

---
 OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml

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

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..76211aaf1
--- /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="org.sufficientlysecure.keychain.debug.provider"
+    android:accountType="@string/account_type"
+    android:supportsUploading="false"
+    android:userVisible="true"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true" />
\ No newline at end of file
-- 
cgit v1.2.3


From 448657602ce5baa5b2a99e26ab2eb2fb8061778f Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Thu, 30 Jul 2015 04:39:38 +0530
Subject: improved orbot notify, added periodic sync

---
 OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
index 76211aaf1..3923fae59 100644
--- a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
+++ b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="org.sufficientlysecure.keychain.debug.provider"
+    android:contentAuthority="@string/provider_content_authority"
     android:accountType="@string/account_type"
     android:supportsUploading="false"
     android:userVisible="true"
-- 
cgit v1.2.3


From 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:08:42 +0530
Subject: added sync preferences

---
 OpenKeychain/src/main/res/xml/preference_headers.xml |  3 +++
 OpenKeychain/src/main/res/xml/sync_preferences.xml   | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/xml/sync_preferences.xml

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

diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index b7512b062..606196c1e 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -11,4 +11,7 @@
     <header
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment"
         android:title="@string/section_proxy_settings" />
+    <header
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment"
+        android:title="@string/section_sync_settings" />
 </preference-headers>
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..d4ea81591
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -0,0 +1,12 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:key="syncKeyserver"
+        android:persistent="false"
+        android:title="@string/label_sync_settings_keyserver_title"
+        android:summary="@string/label_sync_settings_keyserver_summary" />
+    <CheckBoxPreference
+        android:key="syncContacts"
+        android:persistent="false"
+        android:title="@string/label_sync_settings_contacts_title"
+        android:summary="@string/label_sync_settings_contacts_summary" />
+</PreferenceScreen>
-- 
cgit v1.2.3


From f625a26bbd9e4e1049480028b7738ff4e37fd712 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:39:24 +0530
Subject: added on/off summaries

---
 OpenKeychain/src/main/res/xml/sync_preferences.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml
index d4ea81591..e870be9ec 100644
--- a/OpenKeychain/src/main/res/xml/sync_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -2,11 +2,9 @@
     <CheckBoxPreference
         android:key="syncKeyserver"
         android:persistent="false"
-        android:title="@string/label_sync_settings_keyserver_title"
-        android:summary="@string/label_sync_settings_keyserver_summary" />
+        android:title="@string/label_sync_settings_keyserver_title"/>
     <CheckBoxPreference
         android:key="syncContacts"
         android:persistent="false"
-        android:title="@string/label_sync_settings_contacts_title"
-        android:summary="@string/label_sync_settings_contacts_summary" />
+        android:title="@string/label_sync_settings_contacts_title" />
 </PreferenceScreen>
-- 
cgit v1.2.3


From 7ba0b93ceb2919aa549c14560ab434c39a364445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 24 Aug 2015 00:37:38 +0200
Subject: Move proxy pref values out of strings

---
 OpenKeychain/src/main/res/xml/proxy_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
index 94e101cb6..d8e9d8b89 100644
--- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml
+++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
@@ -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" />
-- 
cgit v1.2.3


From ec7a3a704701537eda24afe16081b18b34497928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 12:24:37 +0200
Subject: Experimental feature setting

---
 OpenKeychain/src/main/res/xml/adv_preferences.xml  | 23 ----------------------
 .../src/main/res/xml/passphrase_preferences.xml    | 23 ++++++++++++++++++++++
 .../src/main/res/xml/preference_headers.xml        |  7 +++++--
 3 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/xml/adv_preferences.xml
 create mode 100644 OpenKeychain/src/main/res/xml/passphrase_preferences.xml

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

diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
deleted file mode 100644
index 7dd649e5d..000000000
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-        android:entries="@array/passphrase_cache_ttl_entries"
-        android:entryValues="@array/passphrase_cache_ttl_values"
-        android:key="passphraseCacheTtl"
-        android:persistent="false"
-        android:title="@string/label_passphrase_cache_ttl" />
-    <CheckBoxPreference
-        android:key="passphraseCacheSubs"
-        android:persistent="false"
-        android:title="@string/label_passphrase_cache_subs" />
-    <CheckBoxPreference
-        android:key="useDefaultYubikeyPin"
-        android:persistent="false"
-        android:defaultValue="true"
-        android:title="@string/label_use_default_yubikey_pin"
-        android:summary="@string/label_label_use_default_yubikey_pin_summary" />
-    <CheckBoxPreference
-        android:key="useNumKeypadForYubikeyPin"
-        android:persistent="false"
-        android:defaultValue="false"
-        android:title="@string/label_use_num_keypad_for_yubikey_pin" />
-</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
new file mode 100644
index 000000000..7dd649e5d
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -0,0 +1,23 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+        android:entries="@array/passphrase_cache_ttl_entries"
+        android:entryValues="@array/passphrase_cache_ttl_values"
+        android:key="passphraseCacheTtl"
+        android:persistent="false"
+        android:title="@string/label_passphrase_cache_ttl" />
+    <CheckBoxPreference
+        android:key="passphraseCacheSubs"
+        android:persistent="false"
+        android:title="@string/label_passphrase_cache_subs" />
+    <CheckBoxPreference
+        android:key="useDefaultYubikeyPin"
+        android:persistent="false"
+        android:defaultValue="true"
+        android:title="@string/label_use_default_yubikey_pin"
+        android:summary="@string/label_label_use_default_yubikey_pin_summary" />
+    <CheckBoxPreference
+        android:key="useNumKeypadForYubikeyPin"
+        android:persistent="false"
+        android:defaultValue="false"
+        android:title="@string/label_use_num_keypad_for_yubikey_pin" />
+</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 606196c1e..36fc9a7ae 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -6,12 +6,15 @@
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment"
         android:title="@string/section_cloud_search" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$PassphrasePrefsFragment"
         android:title="@string/section_passphrase_cache" />
     <header
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment"
         android:title="@string/section_proxy_settings" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment"
         android:title="@string/section_sync_settings" />
+    <header
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment"
+        android:title="@string/section_other_settings" />
 </preference-headers>
-- 
cgit v1.2.3


From c292b8d9c3497b1482f3e4856033e10d06dd9388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 13:59:26 +0200
Subject: Experimental features settings reworked

---
 .../src/main/res/xml/experimental_preferences.xml    | 20 ++++++++++++++++++++
 OpenKeychain/src/main/res/xml/preference_headers.xml |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/xml/experimental_preferences.xml

(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
new file mode 100644
index 000000000..dbf19bddb
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -0,0 +1,20 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:persistent="false"
+        android:selectable="false"
+        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" />
+</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index 36fc9a7ae..4c40b9d1f 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -15,6 +15,6 @@
         android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment"
         android:title="@string/section_sync_settings" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment"
-        android:title="@string/section_other_settings" />
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment"
+        android:title="@string/section_experimental_features" />
 </preference-headers>
-- 
cgit v1.2.3


From 905e738621e43908e5dd19894544acf97f9076e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 27 Aug 2015 14:05:58 +0200
Subject: Use SwitchPreference more often

---
 OpenKeychain/src/main/res/xml/cloud_search_prefs.xml | 4 ++--
 OpenKeychain/src/main/res/xml/proxy_prefs.xml        | 4 ++--
 OpenKeychain/src/main/res/xml/sync_preferences.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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

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/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
index d8e9d8b89..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" />
diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml
index e870be9ec..de41ff030 100644
--- a/OpenKeychain/src/main/res/xml/sync_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml
@@ -1,9 +1,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="syncKeyserver"
         android:persistent="false"
         android:title="@string/label_sync_settings_keyserver_title"/>
-    <CheckBoxPreference
+    <SwitchPreference
         android:key="syncContacts"
         android:persistent="false"
         android:title="@string/label_sync_settings_contacts_title" />
-- 
cgit v1.2.3


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


From 765ec094c9415fcaddd65b7b743179b2ea7dc098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 28 Aug 2015 15:18:11 +0200
Subject: Make keybase an experimental feature

---
 OpenKeychain/src/main/res/xml/experimental_preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(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 eb88e3ed9..33ab92697 100644
--- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -18,6 +18,13 @@
         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"
-- 
cgit v1.2.3


From feef4a93abd2ebcd7a4dd6868c9a924628863a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 29 Aug 2015 17:19:58 +0200
Subject: Reword experimental settings

---
 OpenKeychain/src/main/res/xml/experimental_preferences.xml | 1 +
 1 file changed, 1 insertion(+)

(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 33ab92697..ff1fa5a95 100644
--- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml
@@ -2,6 +2,7 @@
     <Preference
         android:persistent="false"
         android:selectable="false"
+        android:title="@string/label_experimental_settings_desc_title"
         android:summary="@string/label_experimental_settings_desc_summary" />
 
     <SwitchPreference
-- 
cgit v1.2.3


From dd850e5c72db1601aef54f9f35e1a2b11ae719c5 Mon Sep 17 00:00:00 2001
From: Kaladin Light <0.kaladin@gmail.com>
Date: Thu, 3 Sep 2015 13:25:09 -0400
Subject: Fixes open-keychain/open-keychain#1515 Move launcher icons to mipmap

---
 OpenKeychain/src/main/res/xml/account_desc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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" />
-- 
cgit v1.2.3