use the key server preference to fill a Spinner in the key server query activity, allowing to query each server, also moved some previously static labels into strings.xml

Update issue 9
Key server preferences are now used in key server query activity.

4 files changed, 16 insertions, 11 deletions

diff --git a/res/layout/create_key.xml b/res/layout/create_key.xml
index ab327ffeb..d8ccc73ec 100644
--- a/res/layout/create_key.xml
+++ b/res/layout/create_key.xml
@@ -29,7 +29,7 @@
             <TableRow>
 
                 <TextView android:id="@+id/label_algorithm"
-                          android:text="Algorithm"
+                          android:text="@string/label_algorithm"
                           android:layout_height="wrap_content"
                           android:layout_width="wrap_content"
                           android:layout_gravity="center_vertical"
@@ -45,7 +45,7 @@
             <TableRow>
 
                 <TextView android:id="@+id/label_size"
-                          android:text="Key Size"
+                          android:text="@string/label_keySize"
                           android:layout_height="wrap_content"
                           android:layout_width="wrap_content"
                           android:layout_gravity="center_vertical"
diff --git a/res/layout/edit_key_key_item.xml b/res/layout/edit_key_key_item.xml
index ba428938e..2db805d09 100644
--- a/res/layout/edit_key_key_item.xml
+++ b/res/layout/edit_key_key_item.xml
@@ -43,7 +43,7 @@
 
                 <TextView
                    android:id="@+id/label_keyId"
-                   android:text="Key ID"
+                   android:text="@string/label_keyId"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:layout_gravity="center_vertical"
@@ -63,7 +63,7 @@
 
                 <TextView
                     android:id="@+id/label_algorithm"
-                    android:text="Algorithm"
+                    android:text="@string/label_algorithm"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -82,7 +82,7 @@
 
                 <TextView
                     android:id="@+id/label_creation"
-                    android:text="Creation"
+                    android:text="@string/label_creation"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
 
                 <TextView
                     android:id="@+id/label_expiry"
-                    android:text="Expiry"
+                    android:text="@string/label_expiry"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -116,7 +116,7 @@
 
                 <TextView
                     android:id="@+id/label_usage"
-                    android:text="Usage"
+                    android:text="@string/label_usage"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index 2dc383a01..d5c7c0fa5 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -29,7 +29,7 @@
 
     <RadioButton
         android:id="@+id/isMainUserId"
-        android:text="Main User ID"
+        android:text="@string/label_mainUserId"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_marginLeft="20dip"/>
@@ -49,7 +49,7 @@
 
                 <TextView
                     android:id="@+id/label_name"
-                    android:text="Name"
+                    android:text="@string/label_name"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
 
                 <TextView
                     android:id="@+id/label_email"
-                    android:text="Email"
+                    android:text="@string/label_email"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
 
                 <TextView
                     android:id="@+id/label_comment"
-                    android:text="Comment"
+                    android:text="@string/label_comment"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
diff --git a/res/layout/key_server_query_layout.xml b/res/layout/key_server_query_layout.xml
index 167d02fef..6af4f3644 100644
--- a/res/layout/key_server_query_layout.xml
+++ b/res/layout/key_server_query_layout.xml
@@ -20,6 +20,11 @@
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
+    <Spinner
+        android:id="@+id/keyServer"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"