Merge lp:~mterry/unity8/statsWelcomeScreen into lp:unity8

[Michael Terry]

Listen to the system setting StatsWelcomeScreen, which tells us whether to show user-specific infographic data in the greeter.

(Whoops, forgot to set prerequisite branch again)

Listen to the system setting StatsWelcomeScreen, which tells us whether to show user-specific infographic data in the greeter.

In addition to the main attraction, I fixed a bug with animations when switching between data and no-data in the infographic (the change in Infographic.qml). And I added a tiny test for the new feature.

Support for StatsWelcomeScreen is part of bug 1207857, and the option can be seen in the Privacy section of the system settings. Note that toggling that value, as of this writing, doesn't actually work due to a policykit issue. But to manually change the setting, these dbus commands can be used:

To turn stats off:
dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.ubuntu.touch.AccountsService.SecurityPrivacy string:StatsWelcomeScreen variant:boolean:false

To turn back on again:
dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.ubuntu.touch.AccountsService.SecurityPrivacy string:StatsWelcomeScreen variant:boolean:true

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:275
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mterry/unity8/statsWelcomeScreen/+merge/184153/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/911/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3059/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/620/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1546/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/912/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/911/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3065/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/622/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:276
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mterry/unity8/statsWelcomeScreen/+merge/184153/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/918/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3072/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/633/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/919
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/919/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3078
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/635
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/635/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/unity8-ci/947/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/741
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/619

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:278
http://jenkins.qa.ubuntu.com/job/unity8-ci/1026/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3522
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1050
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1027
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1027/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3534
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1052
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1052/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/891

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/unity8-ci/1047/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3676
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1204
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1048
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1048/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1047
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3688
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1206
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1000
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1012

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/unity8-ci/1050/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3713/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1241
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1051
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1050
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3725
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1243
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1048

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity8-ci/1059/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1060
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1060/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1059
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1275/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1079

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity8-ci/1078/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3894/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1460/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/102/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1079/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1078/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1462/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/unity8-ci/1079/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3895/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1461/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1080/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1079/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3946/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1463/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please merge trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/unity8-ci/1105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1547
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1847/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1105
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4029
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1549
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1549/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1317

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Merged from trunk. I think the jenkins failure was a one-off.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/unity8-ci/1117/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3990/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1598
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1864
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1117
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1117/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4078/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1355

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

mzanetti@noneyet ~/Development/reviews/statsWelcomeScreen/builddir $ make testPhone
Scanning dependencies of target testPhone
Fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading configurations from ~/.fonts.conf is deprecated.
file:///home/mzanetti/Development/reviews/statsWelcomeScreen/Components/CrossFadeImage.qml:39: Unable to assign QSize to QSizeF
********* Start testing of qmltestrunner *********
Config: Using QTest library 5.0.2, Qt 5.0.2
PASS : qmltestrunner::Greeter::initTestCase()
PASS : qmltestrunner::Greeter::test_properties()
FAIL! : qmltestrunner::Greeter::test_statsWelcomeScreen() Uncaught exception: LightDM is not defined
   Loc: [(0)]
PASS : qmltestrunner::Greeter::test_teaseLockedUnlocked(unlocked)
PASS : qmltestrunner::Greeter::test_teaseLockedUnlocked(locked)
PASS : qmltestrunner::Greeter::test_teasingArea(left)
PASS : qmltestrunner::Greeter::test_teasingArea(right)
PASS : qmltestrunner::Greeter::test_wallpaper(set)
PASS : qmltestrunner::Greeter::test_wallpaper(unset)
QWARN : qmltestrunner::Greeter::test_wallpaper(invalid) file:///home/mzanetti/Development/reviews/statsWelcomeScreen/Greeter/GreeterContent.qml:55:5: QML QQuickImage: Cannot open: file:///home/mzanetti/Development/reviews/statsWelcomeScreen/Greeter/invalid
QWARN : qmltestrunner::Greeter::test_wallpaper(invalid) file:///home/mzanetti/Development/reviews/statsWelcomeScreen/Greeter/GreeterContent.qml:55:5: QML QQuickImage: Binding loop detected for property "source"
PASS : qmltestrunner::Greeter::test_wallpaper(invalid)
PASS : qmltestrunner::Greeter::cleanupTestCase()
Totals: 10 passed, 1 failed, 0 skipped
********* Finished testing of qmltestrunner *********
make[3]: *** [tests/qmltests/CMakeFiles/testPhone] Error 1
make[2]: *** [tests/qmltests/CMakeFiles/testPhone.dir/all] Error 2
make[1]: *** [tests/qmltests/CMakeFiles/testPhone.dir/rule] Error 2
make: *** [testPhone] Error 2

[Michael Zanetti (mzanetti)]

Hmm... when calling this method something weird happens:

the showAnimation and the hideAnimation start at the same time and fight each other, which causes the infographic being left with only half of the dots painted. Even though it looks quite nice I don't think this is intentional, is it?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/unity8-ci/1175/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1863
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1175
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1174
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/63
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1865
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1865/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1573

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

OK, updated this branch to prevent overlapping animations. Except for the no-data -> data transition, where libusermetrics itself forces us to show immediately, since it signals itself that we're ready for the show animation (usually libusermetrics leaves that to us, but not in this case). So while that transition is abrupt, the data -> no-data looks good and neither shows overlapping animations like it used to.

[Michael Zanetti (mzanetti)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/unity8-ci/1182/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4219
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1182
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1181
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/87
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1888
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1888/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1584
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1597

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1182/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/unity8-autolanding/511/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/2552/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4245
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1913/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/515
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/516
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/113
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1915
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1915/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1611/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1627

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/unity8-autolanding/523/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4335
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/527
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/527/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2045
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2045/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1732
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1748

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/unity8-autolanding/527/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4345
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2062
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/531
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/531/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2064/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1751
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1768

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/unity8-autolanding/529/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/2593/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4357
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2080
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/533
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2082
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2082/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1768
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1785

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

OK it seems those test failures are valid... Or at least I can't get them to pass. Can you verify that autopilot tests pass on device?

review: Needs Information

[Michael Terry (mterry)]

You're right... I don't see the extra 3 application_lifecycle errors on my desktop, only when running on the device. But it seems to only be with this branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/unity8-ci/1238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4416
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1238
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/291
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/291/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2160
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2160/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1837
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1855

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/statsWelcomeScreen]

286. By Michael Terry on 2013-10-03

Don't crash if we only ever set an empty username in our mock libusermetrics

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/unity8-ci/1240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2186
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1240
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2188
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1881

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-09-24 13:00:33 +0000
+++ Greeter/GreeterContent.qml	2013-10-03 04:28:43 +0000
@@ -135,19 +135,23 @@
 
     Infographics {
         id: infographics
+        objectName: "infographics"
         height: narrowMode ? parent.height : 0.75 * parent.height
         model: greeterContentLoader.infographicModel
 
-        Component.onCompleted: infographics.updateUsername(greeterContentLoader.currentIndex)
+        property string selectedUser
+        property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
+        onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
+
+        Component.onCompleted: {
+            selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
+            greeterContentLoader.infographicModel.username = infographicUser
+            greeterContentLoader.infographicModel.readyForDataChange()
+        }
 
         Connections {
             target: root
-            onSelected: infographics.updateUsername(uid)
-        }
-
-        function updateUsername(uid) {
-            greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
-            greeterContentLoader.infographicModel.readyForDataChangeSlot();
+            onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
         }
 
         anchors {

=== modified file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml	2013-09-03 14:39:25 +0000
+++ Greeter/Infographics.qml	2013-10-03 04:28:43 +0000
@@ -29,21 +29,30 @@
     Connections {
         target: model
 
+        onDataAboutToAppear: startHideAnimation() // hide "no data" label
         onDataAppeared: startShowAnimation()
 
         onDataAboutToChange: startHideAnimation()
-
         onDataChanged: startShowAnimation()
 
         onDataAboutToDisappear: startHideAnimation()
+        onDataDisappeared: startShowAnimation() // show "no data" label
     }
 
     function startShowAnimation() {
+        dotHideAnimTimer.stop()
+        circleShrinkAnimTimer.stop()
+        notification.hideAnim.stop()
+
         dotShowAnimTimer.startFromBeginning()
         notification.showAnim.start()
     }
 
     function startHideAnimation() {
+        dotShowAnimTimer.stop()
+        circleGrowAnimTimer.stop()
+        notification.showAnim.stop()
+
         dotHideAnimTimer.startFromBeginning()
         notification.hideAnim.start()
     }

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2013-09-19 15:36:54 +0000
+++ plugins/AccountsService/AccountsService.cpp	2013-10-03 04:28:43 +0000
@@ -44,6 +44,7 @@
 
     updateDemoEdges();
     updateBackgroundFile();
+    updateStatsWelcomeScreen();
 }
 
 bool AccountsService::demoEdges() const
@@ -62,6 +63,11 @@
     return m_backgroundFile;
 }
 
+bool AccountsService::statsWelcomeScreen() const
+{
+    return m_statsWelcomeScreen;
+}
+
 void AccountsService::updateDemoEdges()
 {
     auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
@@ -80,6 +86,15 @@
     }
 }
 
+void AccountsService::updateStatsWelcomeScreen()
+{
+    bool statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();
+    if (m_statsWelcomeScreen != statsWelcomeScreen) {
+        m_statsWelcomeScreen = statsWelcomeScreen;
+        Q_EMIT statsWelcomeScreenChanged();
+    }
+}
+
 void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
 {
     if (m_user != user) {
@@ -90,6 +105,10 @@
         if (changed.contains("demo-edges")) {
             updateDemoEdges();
         }
+    } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
+        if (changed.contains("StatsWelcomeScreen")) {
+            updateStatsWelcomeScreen();
+        }
     }
 }
 

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2013-09-19 15:36:54 +0000
+++ plugins/AccountsService/AccountsService.h	2013-10-03 04:28:43 +0000
@@ -38,6 +38,9 @@
     Q_PROPERTY (QString backgroundFile
                 READ backgroundFile
                 NOTIFY backgroundFileChanged)
+    Q_PROPERTY (bool statsWelcomeScreen
+                READ statsWelcomeScreen
+                NOTIFY statsWelcomeScreenChanged)
 
 public:
     explicit AccountsService(QObject *parent = 0);
@@ -47,11 +50,13 @@
     bool demoEdges() const;
     void setDemoEdges(bool demoEdges);
     QString backgroundFile() const;
+    bool statsWelcomeScreen() const;
 
 Q_SIGNALS:
     void userChanged();
     void demoEdgesChanged();
     void backgroundFileChanged();
+    void statsWelcomeScreenChanged();
 
 private Q_SLOTS:
     void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -60,11 +65,13 @@
 private:
     void updateDemoEdges();
     void updateBackgroundFile();
+    void updateStatsWelcomeScreen();
 
     AccountsServiceDBusAdaptor *m_service;
     QString m_user;
     bool m_demoEdges;
     QString m_backgroundFile;
+    bool m_statsWelcomeScreen;
 };
 
 #endif

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2013-09-19 17:10:23 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2013-10-03 04:28:43 +0000
@@ -20,7 +20,8 @@
 
 AccountsService::AccountsService(QObject* parent)
   : QObject(parent),
-    m_backgroundFile(TOP_SRCDIR "/graphics/phone_background.jpg")
+    m_backgroundFile(TOP_SRCDIR "/graphics/phone_background.jpg"),
+    m_statsWelcomeScreen(true)
 {
 }
 
@@ -54,3 +55,14 @@
     m_backgroundFile = backgroundFile;
     backgroundFileChanged();
 }
+
+bool AccountsService::statsWelcomeScreen() const
+{
+    return m_statsWelcomeScreen;
+}
+
+void AccountsService::setStatsWelcomeScreen(bool statsWelcomeScreen)
+{
+    m_statsWelcomeScreen = statsWelcomeScreen;
+    statsWelcomeScreenChanged();
+}

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2013-09-19 17:10:23 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2013-10-03 04:28:43 +0000
@@ -39,6 +39,10 @@
                 READ backgroundFile
                 WRITE setBackgroundFile // only available in mock
                 NOTIFY backgroundFileChanged)
+    Q_PROPERTY (bool statsWelcomeScreen
+                READ statsWelcomeScreen
+                WRITE setStatsWelcomeScreen // only available in mock
+                NOTIFY statsWelcomeScreenChanged)
 
 public:
     explicit AccountsService(QObject *parent = 0);
@@ -49,14 +53,18 @@
     void setDemoEdges(bool demoEdges);
     QString backgroundFile() const;
     void setBackgroundFile(const QString &backgroundFile);
+    bool statsWelcomeScreen() const;
+    void setStatsWelcomeScreen(bool statsWelcomeScreen);
 
 Q_SIGNALS:
     void userChanged();
     void demoEdgesChanged();
     void backgroundFileChanged();
+    void statsWelcomeScreenChanged();
 
 private:
     QString m_backgroundFile;
+    bool m_statsWelcomeScreen;
 };
 
 #endif

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2013-06-14 19:35:25 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2013-10-03 04:28:43 +0000
@@ -228,7 +228,7 @@
 
 void UserMetricsPrivate::setUsername(const QString &username)
 {
-    if (m_username == username) {
+    if (m_username == username && m_newData) {
         return;
     }
 
@@ -407,7 +407,11 @@
 
 QString UserMetrics::label() const
 {
-    return d_ptr->m_label;
+    if (d_ptr->m_label.isEmpty()) {
+        return "No data";
+    } else {
+        return d_ptr->m_label;
+    }
 }
 
 QString UserMetrics::username() const

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2013-10-03 04:28:43 +0000
@@ -64,15 +64,15 @@
 
         function test_set_username_data() {
             return [
-                { username: "has-password" },
-                { username: "no-password" },
-                { username: "empty-name" }
+                { username: "has-password", label: "<b>19</b> minutes talk time" },
+                { username: "two-factor", label: "No data" },
+                { username: "", label: "No data" },
             ]
         }
 
         function test_set_username(data) {
             infographicModel.username = data.username
-            tryCompare(label, "text", "<b>19</b> minutes talk time")
+            tryCompare(label, "text", data.label)
         }
     }
 

=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
--- tests/qmltests/Greeter/tst_Phone.qml	2013-09-13 15:17:02 +0000
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-10-03 04:28:43 +0000
@@ -19,6 +19,7 @@
 import ".."
 import "../../../Greeter"
 import AccountsService 0.1
+import LightDM 0.1 as LightDM
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
 
@@ -53,6 +54,10 @@
         name: "Greeter"
         when: windowShown
 
+        function cleanup() {
+            AccountsService.statsWelcomeScreen = true
+        }
+
         function test_properties() {
             compare(greeter.multiUser, false)
             compare(greeter.narrowMode, true)
@@ -105,6 +110,16 @@
             tryCompareFunction(function() { return greeter.x;},  0);
         }
 
+        function test_statsWelcomeScreen() {
+            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
+            compare(AccountsService.statsWelcomeScreen, true)
+            tryCompare(LightDM.Infographic, "username", "single")
+            AccountsService.statsWelcomeScreen = false
+            tryCompare(LightDM.Infographic, "username", "")
+            AccountsService.statsWelcomeScreen = true
+            tryCompare(LightDM.Infographic, "username", "single")
+        }
+
         function test_wallpaper_data() {
             return [
                 {tag: "set", accounts: "../tests/data/unity/backgrounds/blue.png", expected: "blue.png"},