Merge lp:~mzanetti/unity/8-lockscreen-design-tweaks into lp:unity/8.0

[Michael Zanetti]

don't clear lockscreen directly after login, its still visible in the fading animation. Clear it when it is requested to be shown instead

this also removes a colon that design didn't like and updates tests to make sure the above works

[Nicolas d'Offay (nicolas-doffay)]

On output:
file:///home/phablet/shell/Greeter/Lockscreen.qml:46: TypeError: Cannot call method 'clear' of null

Perhaps also a good idea to add some commentary regarding the reset() function since it's usage looks a bit suspect.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> On output:
> file:///home/phablet/shell/Greeter/Lockscreen.qml:46: TypeError: Cannot call
> method 'clear' of null

Fixed. Well spotted!

> Perhaps also a good idea to add some commentary regarding the reset() function
> since it's usage looks a bit suspect.

Done

[Nicolas d'Offay (nicolas-doffay)]

Looks good to me now!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/181/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/328/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/330/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/181/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-8.0-autolanding/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-autolanding/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-autolanding/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/170
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/332/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/334
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/303

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/184/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/183
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/335
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/304

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/185/rebuild

review: Approve (continuous-integration)

=== modified file 'Greeter/Lockscreen.qml'
--- Greeter/Lockscreen.qml	2013-06-06 12:18:34 +0000
+++ Greeter/Lockscreen.qml	2013-06-24 15:37:35 +0000
@@ -41,7 +41,14 @@
     signal cancel()
     signal emergencyCall()
 
+    onRequiredChanged: {
+        if (required && pinPadLoader.item) {
+            pinPadLoader.item.clear(false);
+        }
+    }
+
     function reset() {
+        // This causes the loader below to destry and recreate the source
         pinPadLoader.resetting = true;
         pinPadLoader.resetting = false;
     }
@@ -140,7 +147,6 @@
             }
             if (LightDM.Greeter.authenticated) {
                 root.unlocked();
-                pinPadLoader.item.clear(false);
             } else {
                 pinPadLoader.item.clear(true);
             }

=== modified file 'Shell.qml'
--- Shell.qml	2013-06-20 15:24:23 +0000
+++ Shell.qml	2013-06-24 15:37:35 +0000
@@ -380,7 +380,7 @@
                 } else {
                     lockscreen.alphaNumeric = true
                 }
-                lockscreen.placeholderText = i18n.tr("Please enter %1:").arg(text);
+                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
                 lockscreen.show();
             }
         }

=== modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
--- tests/qmltests/Greeter/tst_Lockscreen.qml	2013-06-06 12:18:34 +0000
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2013-06-24 15:37:35 +0000
@@ -187,8 +187,8 @@
             unlockedCheckBox.checked = false
             LightDM.Greeter.authenticate(data.username)
 
+            var inputField = findChild(lockscreen, "pinentryField")
             if (data.alphanumeric) {
-                var inputField = findChild(lockscreen, "pinentryField")
                 mouseClick(inputField, units.gu(1), units.gu(1))
                 typeString(data.password)
                 keyClick(Qt.Key_Enter)
@@ -200,6 +200,12 @@
                 }
             }
             tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
+            if (!data.unlockedSignal) {
+                // make sure the input is cleared on wrong input
+                tryCompareFunction(function() {return inputField.text.length == 0}, true)
+            } else {
+                tryCompareFunction(function() {return inputField.text.length > 0}, true)
+            }
         }
     }
 }