aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-13 15:03:49 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-13 15:03:49 +0200
commitbfafc44a33e1aa12c6846bace9001e04574f4c20 (patch)
tree1987eb643ab42073ec2fe8105174e35da4c1c5b3 /OpenKeychain/src/main/res/xml
parentd7d2ce7652ec858d3457aed806c05bd9551df8c4 (diff)
parentb86d235177da91b23562d28389748cce011ddc9a (diff)
downloadopen-keychain-bfafc44a33e1aa12c6846bace9001e04574f4c20.tar.gz
open-keychain-bfafc44a33e1aa12c6846bace9001e04574f4c20.tar.bz2
open-keychain-bfafc44a33e1aa12c6846bace9001e04574f4c20.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
-rw-r--r--OpenKeychain/src/main/res/xml/adv_preferences.xml6
1 files changed, 5 insertions, 1 deletions
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>