Merge lp:~cimi/ubuntu-system-settings/fix-1390557 into lp:ubuntu-system-settings

[Andrea Cimitan]

Delay password set/confirm screens after entering the 4th digit, fixing 1390557

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
y
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
not needed
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
not needed
 * Has your component "TestPlan” been executed successfully on emulator, N4?
no
 * Has a 5 minute exploratory testing run been executed on N4?
on another device
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
no
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
no
 * What components might get impacted by your changes?
wizard
 * Have you requested review by the teams of these owning components?
I will

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1194
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1748/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/96
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/18
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/96
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15637
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/61
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/61/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

That does feel nicer.

 * Are any changes against your component pending/needed to land the MP under review in a functional state and are those called out explicitly by the submitter?
 NA

 * Did you do exploratory testing related to the component you own with the MP changeset included?
 Yes

 * Has the submitter requested review by all the relevant teams/reviewers?
 Yes

 * If you are the reviewer owning the component the MP is against, have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
 Yes

review: Approve

=== modified file 'wizard/qml/Pages/passwd-confirm.qml'
--- wizard/qml/Pages/passwd-confirm.qml	2014-10-23 13:27:22 +0000
+++ wizard/qml/Pages/passwd-confirm.qml	2014-11-10 17:28:22 +0000
@@ -60,11 +60,17 @@
 
         onEntered: {
             if (passphrase === root.password) {
-                pageStack.next()
+                confirmTimer.start()
             } else {
                 clear(true)
             }
         }
+
+        Timer {
+            id: confirmTimer
+            interval: UbuntuAnimation.SnapDuration
+            onTriggered: pageStack.next()
+        }
     }
 
     Component {

=== modified file 'wizard/qml/Pages/passwd-set.qml'
--- wizard/qml/Pages/passwd-set.qml	2014-10-23 13:27:22 +0000
+++ wizard/qml/Pages/passwd-set.qml	2014-11-10 17:28:22 +0000
@@ -36,7 +36,13 @@
 
     function confirm() {
         root.password = lockscreen.passphrase;
-        pageStack.load(Qt.resolvedUrl("passwd-confirm.qml"));
+        confirmTimer.start()
+    }
+
+    Timer {
+        id: confirmTimer
+        interval: UbuntuAnimation.SnapDuration
+        onTriggered: pageStack.load(Qt.resolvedUrl("passwd-confirm.qml"));
     }
 
     UnityComponents.Lockscreen {