add preferences, use them where applicable

3 files changed, 155 insertions, 29 deletions

diff --git a/res/layout/encrypt_file.xml b/res/layout/encrypt_file.xml
index ce685e644..3ea2f06ac 100644
--- a/res/layout/encrypt_file.xml
+++ b/res/layout/encrypt_file.xml
@@ -65,14 +65,15 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <TextView android:id="@+id/label_algorithm"
-                          android:text="@string/label_algorithm"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:layout_height="wrap_content"
-                          android:layout_width="0dip"
-                          android:layout_weight="1"
-                          android:layout_gravity="center_vertical"
-                          android:paddingRight="10dip"/>
+                <TextView
+                    android:id="@+id/label_algorithm"
+                    android:text="@string/label_algorithm"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"/>
 
                 <Spinner
                     android:id="@+id/algorithm"
@@ -219,33 +220,37 @@
 
                 <TableRow>
 
-                    <TextView android:id="@+id/label_pass_phrase"
-                              android:text="@string/label_pass_phrase"
-                              android:layout_height="wrap_content"
-                              android:layout_width="wrap_content"
-                              android:layout_gravity="center_vertical"
-                              android:paddingRight="10dip"/>
+                    <TextView
+                        android:id="@+id/label_pass_phrase"
+                        android:text="@string/label_pass_phrase"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"/>
 
-                    <EditText android:id="@+id/pass_phrase"
-                              android:layout_height="wrap_content"
-                              android:layout_width="fill_parent"
-                              android:inputType="textPassword"/>
+                    <EditText
+                        android:id="@+id/pass_phrase"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:inputType="textPassword"/>
 
                 </TableRow>
 
                 <TableRow>
 
-                    <TextView android:id="@+id/label_pass_phrase_again"
-                              android:text="@string/label_pass_phrase_again"
-                              android:layout_height="wrap_content"
-                              android:layout_width="wrap_content"
-                              android:layout_gravity="center_vertical"
-                              android:paddingRight="10dip"/>
-
-                    <EditText android:id="@+id/pass_phrase_again"
-                              android:layout_height="wrap_content"
-                              android:layout_width="fill_parent"
-                              android:inputType="textPassword"/>
+                    <TextView
+                        android:id="@+id/label_pass_phrase_again"
+                        android:text="@string/label_pass_phrase_again"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"/>
+
+                    <EditText
+                        android:id="@+id/pass_phrase_again"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:inputType="textPassword"/>
 
                 </TableRow>
 
diff --git a/res/layout/preferences.xml b/res/layout/preferences.xml
new file mode 100644
index 000000000..0bf579099
--- /dev/null
+++ b/res/layout/preferences.xml
@@ -0,0 +1,114 @@
+<?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.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:paddingTop="5dip"
+        android:layout_marginRight="?android:attr/scrollbarSize">
+
+        <TextView
+            android:id="@+id/section_defaults"
+            android:text="@string/section_defaults"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:layout_marginBottom="5dip"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_encryption_algorithm"
+                android:text="@string/label_encryption_algorithm"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/encryption_algorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_hash_algorithm"
+                android:text="@string/label_hash_algorithm"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/hash_algorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_ascii_armour"
+                android:text="@string/label_ascii_armour"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"/>
+
+            <CheckBox
+                android:id="@+id/ascii_armour"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0bbf7fa2e..e820dc16e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="title_authentification">Authentification</string>
     <string name="title_createKey">Create Key</string>
     <string name="title_editKey">Edit Key</string>
+    <string name="title_preferences">Preferences</string>
 
     <string name="section_userIds">User IDs</string>
     <string name="section_keys">Keys</string>
@@ -49,6 +50,7 @@
     <string name="menu_addAccount">Add GMail Account</string>
     <string name="menu_managePublicKeys">Manage Public Keys</string>
     <string name="menu_manageSecretKeys">Manage Secret Keys</string>
+    <string name="menu_preferences">Settings</string>
 
     <string name="no_keys_selected">Select</string>
     <string name="one_key_selected">1 Selected</string>
@@ -65,6 +67,11 @@
     <string name="label_select_public_keys">Public Key(s)</string>
     <string name="label_use_pass_phrase">Use Pass Phrase</string>
 
+    <string name="label_encryption_algorithm">Encryption Algorithm</string>
+    <string name="label_hash_algorithm">Hash Algorithm</string>
+
+    <string name="section_defaults">Defaults</string>
+
     <string name="sign_only">Sign only</string>
     <string name="encrypt_only">Encrypt only</string>
     <string name="sign_and_encrypt">Sign and Encrypt</string>