From e14cf32264d92c4b0d4ca782d74a1589ee52a396 Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 12 Sep 2014 14:21:18 -0700
Subject: Restore Yubikey setting, lost in fumble-fingered merge

---
 OpenKeychain/src/main/res/xml/adv_preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index 64023b4b5..250f21e2a 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -34,4 +34,11 @@
             android:title="@string/label_write_version_header"
             android:summary="@string/label_write_version_header_summary" />
     </PreferenceCategory>
+    <CheckBoxPreference
+        android:key="useDefaultYubikeyPin"
+        android:persistent="false"
+        android:defaultValue="true"
+        android:title="@string/label_use_default_yubikey_pin"
+        android:summary="@string/label_label_use_default_yubikey_pin_summary" />
+
 </PreferenceScreen>
-- 
cgit v1.2.3