From a48aa2bcaa1ae814e71bd5a36611c7066adf0122 Mon Sep 17 00:00:00 2001
From: bcbarnes-gmx <bcbarnes@gmx.com>
Date: Mon, 22 Jul 2013 11:11:41 -0500
Subject: Change key bit length control into a dropdown

---
 OpenPGP-Keychain/res/layout/create_key.xml | 6 ++----
 OpenPGP-Keychain/res/values/arrays.xml     | 7 ++++++-
 OpenPGP-Keychain/res/values/strings.xml    | 7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'OpenPGP-Keychain/res')

diff --git a/OpenPGP-Keychain/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key.xml
index 8858e8d80..8014dbefc 100644
--- a/OpenPGP-Keychain/res/layout/create_key.xml
+++ b/OpenPGP-Keychain/res/layout/create_key.xml
@@ -58,14 +58,12 @@
                 android:padding="4dp"
                 android:text="@string/label_keySize" />
 
-            <EditText
+            <Spinner
                 android:id="@+id/create_key_size"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:numeric="integer"
-                android:padding="4dp"
-                android:text="@string/default_key_bit_size" />
+                android:padding="4dp" />
         </TableRow>
     </TableLayout>
 
diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml
index 05320c609..950a70821 100644
--- a/OpenPGP-Keychain/res/values/arrays.xml
+++ b/OpenPGP-Keychain/res/values/arrays.xml
@@ -43,5 +43,10 @@
         <item>14400</item>
         <item>28800</item>
     </string-array>
-
+    <string-array name="key_size_spinner_values">
+        <item>@string/key_size_512</item>
+        <item>@string/key_size_1024</item>
+        <item>@string/key_size_2048</item>
+        <item>@string/key_size_4096</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index d02cceff8..a0787a63a 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -324,11 +324,16 @@
     <string name="filterInfo">Filter: \"%s\"</string>
     <string name="shareKeyringWith">Share keyring with…</string>
 
+    <!-- key bit length selections -->
+    <string name="key_size_512">512</string>
+    <string name="key_size_1024">1024</string>
+    <string name="key_size_2048">2048</string>
+    <string name="key_size_4096">4096</string>
+    
     <!-- misc -->
     <string name="fast">fast</string>
     <string name="slow">slow</string>
     <string name="very_slow">very slow</string>
-	<string name="default_key_bit_size">2048</string>
 	
     <!-- APG 2.0 -->
 
-- 
cgit v1.2.3