Merge lp:~mfrey/unity8/lock-fix into lp:unity8

[Michael Frey]

Added a check for Proximity to determine if we show the lock screen.

Added a check for Proximity to determine if we show the lock screen.
Fixes #1378012 and #1378043

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1369
http://jenkins.qa.ubuntu.com/job/unity8-ci/4707/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6067/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1693/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1803/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1801/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7319/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4707/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 4/18 Test #4: whitespace .......................***Failed 1.07 sec
/tmp/buildd/unity8-8.00+14.10.20141013.2bzr1369pkg0utopic1693/qml/Shell.qml: bad whitespace in line 597

review: Needs Fixing

[lp:~mfrey/unity8/lock-fix]

1370. By Michael Frey on 2014-10-20

Remove extra white space.

[Michael Terry (mterry)]

Is this a race between callManager.hasCalls and the status change signal?

[Michael Frey (mfrey)]

> Is this a race between callManager.hasCalls and the status change signal?

Yes.

[Michael Terry (mterry)]

Also, in terms of style:
- Is there a reason you use a grouping parens?
- Use a triple-equal symbol like !== instead of !=
- And the if end-line continuation should look like:

if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
        !callManager.hasCalls && !edgeDemo.running) {
    foo...
}

Or maybe even for better clarity:

if (Powerd.status === Powerd.Off &&
        reason !== Powerd.Proximity &&
        !callManager.hasCalls &&
        !edgeDemo.running) {
    foo...
}

[lp:~mfrey/unity8/lock-fix]

1371. By Michael Frey on 2014-10-20

Better style.

[Michael Frey (mfrey)]

> Also, in terms of style:
> - Is there a reason you use a grouping parens?
> - Use a triple-equal symbol like !== instead of !=
> - And the if end-line continuation should look like:
>
> if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
> !callManager.hasCalls && !edgeDemo.running) {
> foo...
> }
>
> Or maybe even for better clarity:
>
> if (Powerd.status === Powerd.Off &&
> reason !== Powerd.Proximity &&
> !callManager.hasCalls &&
> !edgeDemo.running) {
> foo...
> }

Good catch. Fixed the style and pushed.

[lp:~mfrey/unity8/lock-fix]

1372. By Michael Frey on 2014-10-20

One more time for formatting.

[Michael Terry (mterry)]

Love it!

review: Approve

[Michael Terry (mterry)]

(assuming that jenkins likes it too this time)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4708/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6071/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1802
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5701/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7323
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14871

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4708/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-13 15:41:29 +0000
+++ qml/Shell.qml	2014-10-20 18:34:08 +0000
@@ -594,7 +594,8 @@
         target: Powerd
 
         onStatusChanged: {
-            if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
+            if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
+                    !callManager.hasCalls && !edgeDemo.running) {
                 greeter.showNow()
             }
         }