Merge lp:~seb128/ubuntu-system-settings/security-focus-correct-entry into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] give the focus to the right entry, if the current
unlock method is swipe then there is no "current password" so the new
input line should be the focussed one

[security-privacy] give the focus to the right entry, if the current
unlock method is swipe then there is no "current password" so the new
input line should be the focussed one

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2042/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2060
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2060/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19318

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2042/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great

review: Approve

[Jonas G. Drange (jonas-drange)]

Rejected due to missing test.

review: Disapprove

[Jonas G. Drange (jonas-drange)]

review: Approve

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2015-02-09 15:46:27 +0000
+++ plugins/security-privacy/LockSecurity.qml	2015-03-31 17:22:36 +0000
@@ -181,7 +181,10 @@
                             UbuntuSecurityPrivacyPanel.Swipe)
                         confirmButton.enabled = text.length > 0
                 }
-                Component.onCompleted: forceActiveFocus()
+                Component.onCompleted: {
+                    if (securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe)
+                        forceActiveFocus()
+                }
             }
 
             /* Using bindings since it is, according to documentation,
@@ -244,6 +247,10 @@
                          changeSecurityDialog.newMethod ===
                             UbuntuSecurityPrivacyPanel.Passphrase
                 onTextChanged: { displayMismatchWarning() }
+                Component.onCompleted: {
+                    if (securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe)
+                        forceActiveFocus()
+                }
             }
 
             /* Using bindings since it is, according to documentation,