aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/edit_key_section.xml4
-rw-r--r--res/layout/edit_key_user_id_item.xml4
-rw-r--r--res/layout/key_server_editor.xml4
-rw-r--r--res/values/styles.xml7
-rw-r--r--res/xml/apg_preferences.xml62
-rw-r--r--res/xml/searchable_public_keys.xml13
-rw-r--r--res/xml/searchable_secret_keys.xml13
7 files changed, 49 insertions, 58 deletions
diff --git a/res/layout/edit_key_section.xml b/res/layout/edit_key_section.xml
index e57b3b8df..d14748d4b 100644
--- a/res/layout/edit_key_section.xml
+++ b/res/layout/edit_key_section.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<org.thialfihar.android.apg.ui.widget.SectionView
+<org.apg.ui.widget.SectionView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -63,4 +63,4 @@
android:paddingBottom="6dip"
android:orientation="vertical"/>
-</org.thialfihar.android.apg.ui.widget.SectionView>
+</org.apg.ui.widget.SectionView>
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index d5c7c0fa5..6e7b552dd 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<org.thialfihar.android.apg.ui.widget.UserIdEditor
+<org.apg.ui.widget.UserIdEditor
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -112,4 +112,4 @@
</LinearLayout>
-</org.thialfihar.android.apg.ui.widget.UserIdEditor>
+</org.apg.ui.widget.UserIdEditor>
diff --git a/res/layout/key_server_editor.xml b/res/layout/key_server_editor.xml
index e4c25b316..a02540c2c 100644
--- a/res/layout/key_server_editor.xml
+++ b/res/layout/key_server_editor.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<org.thialfihar.android.apg.ui.widget.KeyServerEditor
+<org.apg.ui.widget.KeyServerEditor
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -49,4 +49,4 @@
android:layout_height="1dip"
android:background="?android:attr/listDivider"/>
-</org.thialfihar.android.apg.ui.widget.KeyServerEditor>
+</org.apg.ui.widget.KeyServerEditor>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 720f7aedb..2a2a69341 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+ 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.
@@ -15,6 +16,7 @@
-->
<resources>
+
<style name="MinusButton">
<item name="android:background">@drawable/btn_circle</item>
<item name="android:src">@drawable/ic_btn_round_minus</item>
@@ -24,4 +26,5 @@
<item name="android:background">@drawable/btn_circle</item>
<item name="android:src">@drawable/ic_btn_round_plus</item>
</style>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/xml/apg_preferences.xml b/res/xml/apg_preferences.xml
index 5527cda1a..7c0dd2206 100644
--- a/res/xml/apg_preferences.xml
+++ b/res/xml/apg_preferences.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+ 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.
@@ -14,71 +15,56 @@
limitations under the License.
-->
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/section_general">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+ <PreferenceCategory android:title="@string/section_general" >
<ListPreference
- android:key="language"
- android:title="@string/label_language"
+ android:dialogTitle="@string/label_language"
android:entries="@array/language_entries"
android:entryValues="@array/language_values"
- android:dialogTitle="@string/label_language" />
+ android:key="language"
+ android:title="@string/label_language" />
- <org.thialfihar.android.apg.ui.widget.IntegerListPreference
- android:persistent="false"
- android:key="passPhraseCacheTtl"
+ <org.apg.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_passPhraseCacheTtl" />
<PreferenceScreen
- android:persistent="false"
android:key="keyServers"
+ android:persistent="false"
android:title="@string/label_keyServers" />
-
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/section_defaults">
-
- <org.thialfihar.android.apg.ui.widget.IntegerListPreference
- android:persistent="false"
+ <PreferenceCategory android:title="@string/section_defaults" >
+ <org.apg.ui.widget.IntegerListPreference
android:key="defaultEncryptionAlgorithm"
- android:title="@string/label_encryptionAlgorithm" />
-
- <org.thialfihar.android.apg.ui.widget.IntegerListPreference
android:persistent="false"
+ android:title="@string/label_encryptionAlgorithm" />
+ <org.apg.ui.widget.IntegerListPreference
android:key="defaultHashAlgorithm"
- android:title="@string/label_hashAlgorithm" />
-
- <org.thialfihar.android.apg.ui.widget.IntegerListPreference
android:persistent="false"
+ android:title="@string/label_hashAlgorithm" />
+ <org.apg.ui.widget.IntegerListPreference
android:key="defaultMessageCompression"
- android:title="@string/label_messageCompression" />
-
- <org.thialfihar.android.apg.ui.widget.IntegerListPreference
android:persistent="false"
+ android:title="@string/label_messageCompression" />
+ <org.apg.ui.widget.IntegerListPreference
android:key="defaultFileCompression"
+ android:persistent="false"
android:title="@string/label_fileCompression" />
<CheckBoxPreference
- android:persistent="false"
android:key="defaultAsciiArmour"
+ android:persistent="false"
android:title="@string/label_asciiArmour" />
-
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/section_advanced">
-
+ <PreferenceCategory android:title="@string/section_advanced" >
<CheckBoxPreference
- android:persistent="false"
android:key="forceV3Signatures"
+ android:persistent="false"
android:title="@string/label_forceV3Signature" />
-
</PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen> \ No newline at end of file
diff --git a/res/xml/searchable_public_keys.xml b/res/xml/searchable_public_keys.xml
index 6bb934fec..e9602b121 100644
--- a/res/xml/searchable_public_keys.xml
+++ b/res/xml/searchable_public_keys.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+ 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.
@@ -14,8 +15,8 @@
limitations under the License.
-->
-<searchable
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/app_name"
- android:hint="@string/hint_publicKeys">
-</searchable>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:hint="@string/hint_publicKeys"
+ android:label="@string/app_name" >
+
+</searchable> \ No newline at end of file
diff --git a/res/xml/searchable_secret_keys.xml b/res/xml/searchable_secret_keys.xml
index e196b4664..a7e8873d6 100644
--- a/res/xml/searchable_secret_keys.xml
+++ b/res/xml/searchable_secret_keys.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+ 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.
@@ -14,8 +15,8 @@
limitations under the License.
-->
-<searchable
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:label="@string/app_name"
- android:hint="@string/hint_secretKeys">
-</searchable>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+ android:hint="@string/hint_secretKeys"
+ android:label="@string/app_name" >
+
+</searchable> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 03:05:36 +0000