[Merge] lp:~phablet-team/ubuntu-system-settings/fingerprint into lp:ubuntu-system-settings

[Jonas G. Drange]

Review: Needs Fixing



Diff comments:

> 
> === modified file 'plugins/security-privacy/LockSecurity.qml'
> --- plugins/security-privacy/LockSecurity.qml	2016-05-17 23:28:16 +0000
> +++ plugins/security-privacy/LockSecurity.qml	2016-06-15 12:15:30 +0000
> @@ -448,12 +464,13 @@
>                  property string swipe: i18n.tr("Swipe (no security)")
>                  property string passcode: i18n.tr("4-digit passcode")
>                  property string passphrase: i18n.tr("Passphrase")
> +                property string fingerprint: i18n.tr("Fingerprint")
>                  property string swipeAlt: i18n.tr("Swipe (no security)… ")
>                  property string passcodeAlt: i18n.tr("4-digit passcode…")
>                  property string passphraseAlt: i18n.tr("Passphrase…")
>  
>                  id: unlockMethod
> -                model: 3
> +                model: Biometryd.available ? 4 : 3

zomg, only present this option if passcode/phrase is set.

>                  delegate: OptionSelectorDelegate {
>                      objectName: {
>                          switch (index) {


-- 
https://code.launchpad.net/~phablet-team/ubuntu-system-settings/fingerprint/+merge/297454
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/ubuntu-system-settings/fingerprint.