From 754b2a6cb15a6af61150cd4b1ce472bebd4fec22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 9 Feb 2014 19:22:14 +0100
Subject: Restructuring for new API library

---
 .../src/main/res/xml/base_preference.xml           | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml

(limited to 'OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml')

diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
new file mode 100644
index 000000000..5febfad44
--- /dev/null
+++ b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceCategory android:title="Intent" >
+        <Preference
+            android:key="intent_demo"
+            android:title="Intent Demo" />
+    </PreferenceCategory>
+    <!-- <PreferenceCategory android:title="AIDL" > -->
+    <!-- <Preference -->
+    <!-- android:key="aidl_demo2" -->
+    <!-- android:title="AIDL Demo (ACCESS_KEYS permission)" /> -->
+    <!-- </PreferenceCategory> -->
+    <PreferenceCategory android:title="OpenPGP Provider" >
+        <org.openintents.openpgp.OpenPgpListPreference
+            android:key="openpgp_provider_list"
+            android:title="Select OpenPGP Provider!" />
+        <Preference
+            android:key="openpgp_provider_demo"
+            android:title="OpenPGP Provider" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3


From 7939aaaa440f84a0df5524f8a1a1c04dd569eedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 14 Feb 2014 02:33:21 +0100
Subject: Introducing new ParcelFileDescriptor pipes

---
 OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml')

diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
index 5febfad44..86b461742 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
@@ -12,7 +12,7 @@
     <!-- android:title="AIDL Demo (ACCESS_KEYS permission)" /> -->
     <!-- </PreferenceCategory> -->
     <PreferenceCategory android:title="OpenPGP Provider" >
-        <org.openintents.openpgp.OpenPgpListPreference
+        <org.openintents.openpgp.util.OpenPgpListPreference
             android:key="openpgp_provider_list"
             android:title="Select OpenPGP Provider!" />
         <Preference
-- 
cgit v1.2.3


From 581e6edb4cdfb6274f21e532ba60a610a3ce1fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 14 Feb 2014 17:19:54 +0100
Subject: cleanup

---
 .../example-app/src/main/res/xml/base_preference.xml                 | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml')

diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
index 86b461742..cb76dc10f 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
@@ -6,11 +6,6 @@
             android:key="intent_demo"
             android:title="Intent Demo" />
     </PreferenceCategory>
-    <!-- <PreferenceCategory android:title="AIDL" > -->
-    <!-- <Preference -->
-    <!-- android:key="aidl_demo2" -->
-    <!-- android:title="AIDL Demo (ACCESS_KEYS permission)" /> -->
-    <!-- </PreferenceCategory> -->
     <PreferenceCategory android:title="OpenPGP Provider" >
         <org.openintents.openpgp.util.OpenPgpListPreference
             android:key="openpgp_provider_list"
-- 
cgit v1.2.3


From 884aaf7e7ac24a54f54c4e714121869346b7a623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 15 Feb 2014 18:44:13 +0100
Subject: save selected provider in list preference

---
 .../example-app/src/main/res/xml/base_preference.xml              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml')

diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
index cb76dc10f..b38e07a36 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="Intent" >
+    <PreferenceCategory android:title="OpenKeychain Intents">
         <Preference
             android:key="intent_demo"
             android:title="Intent Demo" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="OpenPGP Provider" >
+    <PreferenceCategory android:title="OpenPGP Provider API">
         <org.openintents.openpgp.util.OpenPgpListPreference
             android:key="openpgp_provider_list"
             android:title="Select OpenPGP Provider!" />
         <Preference
             android:key="openpgp_provider_demo"
-            android:title="OpenPGP Provider" />
+            android:title="OpenPGP Provider Demo" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3