Merge lp:~mterry/unity/phablet-narrowMode into lp:unity/phablet

[Michael Terry]

Show login list when not in narrow mode, instead of only when we have multiple users.

Show login list when not in narrow mode, instead of only when we have multiple users. This basically means that if the screen becomes big enough, we'll show login list.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:735
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1155/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/21
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1901/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

As we all agree this is a intermediate solution it might classify for a //TODO or //FIXME to keep it in the radar whenever grepping for such stuff.

[Michael Terry (mterry)]

Updated with a comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1164/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1196/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1911

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1165/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1912

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-06-03 15:32:21 +0000
+++ Greeter/GreeterContent.qml	2013-06-05 19:10:32 +0000
@@ -73,7 +73,9 @@
         width: units.gu(29)
         height: parent.height
 
-        source: greeter.multiUser ? "LoginList.qml" : ""
+        // TODO: Once we have a system API for determining which mode we are
+        // in, tablet/phone/desktop, that should be used instead of narrowMode.
+        source: greeter.narrowMode ? "" : "LoginList.qml"
 
         onLoaded: {
             item.currentIndex = greeterContentLoader.currentIndex