aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorTim Bray <timbray@gmail.com>2014-09-12 14:21:18 -0700
committerTim Bray <timbray@gmail.com>2014-09-13 21:41:03 -0700
commite14cf32264d92c4b0d4ca782d74a1589ee52a396 (patch)
treec75a5412c67ef6f27c7b32a230e59f1bf7e9c2d9 /OpenKeychain/src/main
parent1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3 (diff)
downloadopen-keychain-e14cf32264d92c4b0d4ca782d74a1589ee52a396.tar.gz
open-keychain-e14cf32264d92c4b0d4ca782d74a1589ee52a396.tar.bz2
open-keychain-e14cf32264d92c4b0d4ca782d74a1589ee52a396.zip
Restore Yubikey setting, lost in fumble-fingered merge
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/res/xml/adv_preferences.xml7
1 files changed, 7 insertions, 0 deletions
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>