From 2000959997249bf948d61717edab5df7080278cf Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Wed, 5 Mar 2014 20:42:11 +0200
Subject: Put Preferences in subscreen

---
 .../src/main/res/xml/adv_preferences.xml           | 48 +++++++++++++++++
 .../src/main/res/xml/gen_preferences.xml           | 32 +++++++++++
 .../src/main/res/xml/preference_headers.xml        | 25 +++++++++
 .../src/main/res/xml/preference_headers_legacy.xml | 29 ++++++++++
 OpenPGP-Keychain/src/main/res/xml/preferences.xml  | 63 ----------------------
 5 files changed, 134 insertions(+), 63 deletions(-)
 create mode 100644 OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/xml/preference_headers.xml
 create mode 100644 OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml
 delete mode 100644 OpenPGP-Keychain/src/main/res/xml/preferences.xml

(limited to 'OpenPGP-Keychain/src/main/res')

diff --git a/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml b/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml
new file mode 100644
index 000000000..2705bd22f
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/section_defaults" >
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+            android:key="defaultEncryptionAlgorithm"
+            android:persistent="false"
+            android:title="@string/label_encryption_algorithm" />
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+            android:key="defaultHashAlgorithm"
+            android:persistent="false"
+            android:title="@string/label_hash_algorithm" />
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+            android:key="defaultMessageCompression"
+            android:persistent="false"
+            android:title="@string/label_message_compression" />
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+            android:key="defaultFileCompression"
+            android:persistent="false"
+            android:title="@string/label_file_compression" />
+
+        <CheckBoxPreference
+            android:key="defaultAsciiArmour"
+            android:persistent="false"
+            android:title="@string/label_ascii_armor" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/section_advanced" >
+        <CheckBoxPreference
+            android:key="forceV3Signatures"
+            android:persistent="false"
+            android:title="@string/label_force_v3_signature" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml b/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
new file mode 100644
index 000000000..f83fcb0f6
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/section_general" >
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
+            android:entries="@array/pass_phrase_cache_ttl_entries"
+            android:entryValues="@array/pass_phrase_cache_ttl_values"
+            android:key="passPhraseCacheTtl"
+            android:persistent="false"
+            android:title="@string/label_passphrase_cache_ttl" />
+
+        <PreferenceScreen
+            android:key="keyServers"
+            android:persistent="false"
+            android:title="@string/label_key_servers" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml b/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml
new file mode 100644
index 000000000..3506ba322
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    <header
+        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment"
+        android:title="@string/section_general" />
+    <header
+        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment"
+        android:title="@string/section_advanced" />
+</preference-headers>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml b/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml
new file mode 100644
index 000000000..141bf93e5
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:title="@string/section_general" >
+        <intent
+            android:action="org.sufficientlysecure.keychain.ui.PREFS_GEN" />
+    </Preference>
+    <Preference
+        android:title="@string/section_advanced" >
+        <intent
+            android:action="org.sufficientlysecure.keychain.ui.PREFS_ADV" />
+    </Preference>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/xml/preferences.xml b/OpenPGP-Keychain/src/main/res/xml/preferences.xml
deleted file mode 100644
index f5b46c232..000000000
--- a/OpenPGP-Keychain/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <PreferenceCategory android:title="@string/section_general" >
-        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:entries="@array/pass_phrase_cache_ttl_entries"
-            android:entryValues="@array/pass_phrase_cache_ttl_values"
-            android:key="passPhraseCacheTtl"
-            android:persistent="false"
-            android:title="@string/label_passphrase_cache_ttl" />
-
-        <PreferenceScreen
-            android:key="keyServers"
-            android:persistent="false"
-            android:title="@string/label_key_servers" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/section_defaults" >
-        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:key="defaultEncryptionAlgorithm"
-            android:persistent="false"
-            android:title="@string/label_encryption_algorithm" />
-        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:key="defaultHashAlgorithm"
-            android:persistent="false"
-            android:title="@string/label_hash_algorithm" />
-        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:key="defaultMessageCompression"
-            android:persistent="false"
-            android:title="@string/label_message_compression" />
-        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:key="defaultFileCompression"
-            android:persistent="false"
-            android:title="@string/label_file_compression" />
-
-        <CheckBoxPreference
-            android:key="defaultAsciiArmour"
-            android:persistent="false"
-            android:title="@string/label_ascii_armor" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/section_advanced" >
-        <CheckBoxPreference
-            android:key="forceV3Signatures"
-            android:persistent="false"
-            android:title="@string/label_force_v3_signature" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3