From 13ed3bbd8a99b8031dc959f2cb367f5fcc6daba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jerzy=20Ko=C5=82osowski?= <jerzy@kolosowscy.pl>
Date: Mon, 13 Oct 2014 04:47:48 +0200
Subject: Added option for num keypad for YubiKey

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 1 -
 OpenKeychain/src/main/res/values/strings.xml           | 1 +
 OpenKeychain/src/main/res/xml/adv_preferences.xml      | 6 +++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index f003e6994..2ca5199fd 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -19,7 +19,6 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:imeOptions="actionDone"
-            android:inputType="textPassword"
             android:hint="@string/label_passphrase"
             android:ems="10"
             android:layout_gravity="center_horizontal" />
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0b0f0b4fd..3720826fe 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
     <string name="label_use_default_yubikey_pin">"Use default Yubikey PIN"</string>
+    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for Yubikey PIN</string>
     <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access Yubikeys over NFC"</string>
     <string name="label_asymmetric_from">"Signed by:"</string>
     <string name="label_to">"Encrypt to:"</string>
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index 92e0f2ffc..fcca59abe 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -44,5 +44,9 @@
         android:defaultValue="true"
         android:title="@string/label_use_default_yubikey_pin"
         android:summary="@string/label_label_use_default_yubikey_pin_summary" />
-
+    <CheckBoxPreference
+        android:key="useNumKeypadForYubikeyPin"
+        android:persistent="false"
+        android:defaultValue="false"
+        android:title="@string/label_use_num_keypad_for_yubikey_pin" />
 </PreferenceScreen>
-- 
cgit v1.2.3