Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1390557 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

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

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

[Jonas G. Drange (jonas-drange)]

WFM (krillin)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

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

=== modified file 'wizard/qml/Pages/passwd-confirm.qml'
--- wizard/qml/Pages/passwd-confirm.qml	2014-10-31 14:14:22 +0000
+++ wizard/qml/Pages/passwd-confirm.qml	2014-11-18 19:52:45 +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-11-03 19:44:49 +0000
+++ wizard/qml/Pages/passwd-set.qml	2014-11-18 19:52:45 +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 {