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.

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

[lp:~mterry/unity8/statsWelcomeScreen]

276. By Michael Terry on 2013-09-05

Merge from wallpaper branch

277. By Michael Terry on 2013-09-09

Merge from trunk

278. By Michael Terry on 2013-09-17

Merge from trunk

279. By Michael Terry on 2013-09-19

Merge from trunk

280. By Michael Terry on 2013-09-19

Make function naming match unity8 style

281. By Michael Terry on 2013-09-20

Don't use auto

282. By Michael Terry on 2013-09-24

Merge from trunk

283. By Michael Terry on 2013-09-30

Merge from trunk

284. By Michael Terry on 2013-09-30

Prevent overlapping animations

285. By Michael Terry on 2013-10-02

Merge from trunk

286. By Michael Terry on 2013-10-03

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

Unmerged revisions

=== modified file 'Components/EdgeDemo.qml'
--- Components/EdgeDemo.qml	2013-09-03 14:09:28 +0000
+++ Components/EdgeDemo.qml	2013-09-05 17:32:14 +0000
@@ -44,13 +44,13 @@
 
     function hideEdgeDemoInShell() {
         var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);
-        AccountsService.setUserProperty(user, "demo-edges", false);
+        AccountsService.demoEdges = false;
         d.showEdgeDemo = false;
         stopDemo();
     }
 
     function hideEdgeDemoInGreeter() {
-        // TODO: AccountsService.setUserProperty("lightdm", "demo-edges", false);
+        // TODO: AccountsService.demoEdges = false as lightdm user
         d.showEdgeDemoInGreeter = false;
     }
 
@@ -80,7 +80,7 @@
         property QtObject leftEdgeDemo
         property QtObject finalEdgeDemo
         property bool showEdgeDemo: false
-        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.getUserProperty("lightdm", "demo-edges")
+        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.demoEdges as lightdm user
 
         onShowEdgeDemoInGreeterChanged: {
             if (!d.overlay && d.showEdgeDemoInGreeter) {
@@ -126,7 +126,7 @@
 
         onSelected: {
             var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)
-            d.showEdgeDemo = AccountsService.getUserProperty(user, "demo-edges")
+            d.showEdgeDemo = AccountsService.demoEdges
         }
     }
 

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-08-28 20:50:37 +0000
+++ Greeter/GreeterContent.qml	2013-09-05 17:32:14 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import AccountsService 0.1
 import Ubuntu.Components 0.1
 import LightDM 0.1 as LightDM
 import "../Components"
@@ -39,14 +40,30 @@
         color: "black"
     }
 
+    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : shell.defaultBackground
+    onBackgroundValueChanged: wallpaper.source = backgroundValue
+
     CrossFadeImage {
         id: wallpaper
-
-        source: shell.background
         anchors.fill: parent
         fadeInFirst: false
     }
 
+    // See Shell.qml's backgroundSettings treatment for why we need a separate
+    // Image, but it boils down to avoiding binding loop detection.
+    Image {
+        source: wallpaper.source
+        height: 0
+        width: 0
+        sourceSize.height: 0
+        sourceSize.width: 0
+        onStatusChanged: {
+            if (status == Image.Error && source != shell.defaultBackground) {
+                wallpaper.source = shell.defaultBackground
+            }
+        }
+    }
+
     Rectangle {
         anchors.fill: parent
         color: "black"
@@ -117,18 +134,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: updateUsername()
+
+        Component.onCompleted: selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
 
         Connections {
             target: root
-            onSelected: infographics.updateUsername(uid)
+            onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
         }
 
-        function updateUsername(uid) {
-            greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
+        function updateUsername() {
+            greeterContentLoader.infographicModel.username = infographicUser;
             greeterContentLoader.infographicModel.readyForDataChangeSlot();
         }
 

=== modified file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml	2013-09-03 14:39:25 +0000
+++ Greeter/Infographics.qml	2013-09-05 17:32:14 +0000
@@ -29,13 +29,20 @@
     Connections {
         target: model
 
+        property bool appeared: false
+
+        onDataAboutToAppear: {
+            // Don't 'hide' on first appearance, since there is no content yet
+            if (appeared) startHideAnimation() // hide "no data" label
+            appeared = true
+        }
         onDataAppeared: startShowAnimation()
 
         onDataAboutToChange: startHideAnimation()
-
         onDataChanged: startShowAnimation()
 
         onDataAboutToDisappear: startHideAnimation()
+        onDataDisappeared: startShowAnimation() // show "no data" label
     }
 
     function startShowAnimation() {

=== modified file 'Shell.qml'
--- Shell.qml	2013-09-04 20:40:11 +0000
+++ Shell.qml	2013-09-05 17:32:14 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import AccountsService 0.1
 import GSettings 1.0
 import Ubuntu.Application 0.1
 import Ubuntu.Components 0.1
@@ -478,6 +479,7 @@
         onSelected: {
             // Update launcher items for new user
             var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
+            AccountsService.setUser(user);
             LauncherModel.setUser(user);
         }
 

=== added file 'plugins/AccountsService/AccountsBindings.cpp'
--- plugins/AccountsService/AccountsBindings.cpp	1970-01-01 00:00:00 +0000
+++ plugins/AccountsService/AccountsBindings.cpp	2013-09-05 17:32:14 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "AccountsBindings.h"
+#include "AccountsService.h"
+
+#include <QStringList>
+
+AccountsBindings::AccountsBindings(QObject* parent)
+  : QObject(parent),
+    m_service(new AccountsService(this)),
+    m_user(qgetenv("USER"))
+{
+    connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
+            this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
+    connect(m_service, SIGNAL(maybeChanged(const QString &)),
+            this, SLOT(maybeChanged(const QString &)));
+}
+
+void AccountsBindings::setUser(const QString &user)
+{
+    m_user = user;
+    updateDemoEdges();
+    updateBackgroundFile();
+    updateStatsWelcomeScreen();
+}
+
+bool AccountsBindings::getDemoEdges()
+{
+    return m_demoEdges;
+}
+
+void AccountsBindings::setDemoEdges(bool demoEdges)
+{
+    m_demoEdges = demoEdges;
+    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
+}
+
+QString AccountsBindings::getBackgroundFile()
+{
+    return m_backgroundFile;
+}
+
+bool AccountsBindings::getStatsWelcomeScreen()
+{
+    return m_statsWelcomeScreen;
+}
+
+void AccountsBindings::updateDemoEdges()
+{
+    auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
+    if (m_demoEdges != demoEdges) {
+        m_demoEdges = demoEdges;
+        Q_EMIT demoEdgesChanged();
+    }
+}
+
+void AccountsBindings::updateBackgroundFile()
+{
+    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
+    if (m_backgroundFile != backgroundFile) {
+        m_backgroundFile = backgroundFile;
+        Q_EMIT backgroundFileChanged();
+    }
+}
+
+void AccountsBindings::updateStatsWelcomeScreen()
+{
+    auto statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();
+    if (m_statsWelcomeScreen != statsWelcomeScreen) {
+        m_statsWelcomeScreen = statsWelcomeScreen;
+        Q_EMIT statsWelcomeScreenChanged();
+    }
+}
+
+void AccountsBindings::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
+{
+    if (m_user != user) {
+        return;
+    }
+
+    if (interface == "com.canonical.unity.AccountsService") {
+        if (changed.contains("demo-edges")) {
+            updateDemoEdges();
+        }
+    } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
+        if (changed.contains("StatsWelcomeScreen")) {
+            updateStatsWelcomeScreen();
+        }
+    }
+}
+
+void AccountsBindings::maybeChanged(const QString &user)
+{
+    if (m_user != user) {
+        return;
+    }
+
+    // Standard properties might have changed
+    updateBackgroundFile();
+}

=== added file 'plugins/AccountsService/AccountsBindings.h'
--- plugins/AccountsService/AccountsBindings.h	1970-01-01 00:00:00 +0000
+++ plugins/AccountsService/AccountsBindings.h	2013-09-05 17:32:14 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+#ifndef UNITY_ACCOUNTSBINDINGS_H
+#define UNITY_ACCOUNTSBINDINGS_H
+
+#include <QObject>
+#include <QString>
+
+class AccountsService;
+
+class AccountsBindings: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY (bool demoEdges
+                READ getDemoEdges
+                WRITE setDemoEdges
+                NOTIFY demoEdgesChanged)
+    Q_PROPERTY (QString backgroundFile
+                READ getBackgroundFile
+                NOTIFY backgroundFileChanged)
+    Q_PROPERTY (bool statsWelcomeScreen
+                READ getStatsWelcomeScreen
+                NOTIFY statsWelcomeScreenChanged)
+
+public:
+    explicit AccountsBindings(QObject *parent = 0);
+
+    Q_INVOKABLE void setUser(const QString &user);
+
+    bool getDemoEdges();
+    void setDemoEdges(bool demoEdges);
+    QString getBackgroundFile();
+    bool getStatsWelcomeScreen();
+
+Q_SIGNALS:
+    void demoEdgesChanged();
+    void backgroundFileChanged();
+    void statsWelcomeScreenChanged();
+
+private Q_SLOTS:
+    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
+    void maybeChanged(const QString &user);
+
+private:
+    void updateDemoEdges();
+    void updateBackgroundFile();
+    void updateStatsWelcomeScreen();
+
+    AccountsService *m_service;
+    QString m_user;
+    bool m_demoEdges;
+    QString m_backgroundFile;
+    bool m_statsWelcomeScreen;
+};
+
+#endif

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2013-08-22 14:54:08 +0000
+++ plugins/AccountsService/AccountsService.cpp	2013-09-05 17:32:14 +0000
@@ -36,11 +36,11 @@
                                           connection, this);
 }
 
-QVariant AccountsService::getUserProperty(const QString &user, const QString &property)
+QVariant AccountsService::getUserProperty(const QString &user, const QString &interface, const QString &property)
 {
     auto iface = getUserInterface(user);
     if (iface != nullptr && iface->isValid()) {
-        auto answer = iface->call("Get", "com.canonical.unity.AccountsService", property);
+        auto answer = iface->call("Get", interface, property);
         if (answer.type() == QDBusMessage::ReplyMessage) {
             return answer.arguments()[0].value<QDBusVariant>().variant();
         }
@@ -48,13 +48,40 @@
     return QVariant();
 }
 
-void AccountsService::setUserProperty(const QString &user, const QString &property, const QVariant &value)
+void AccountsService::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
 {
     auto iface = getUserInterface(user);
     if (iface != nullptr && iface->isValid()) {
         // The value needs to be carefully wrapped
-        iface->call("Set", "com.canonical.unity.AccountsService", property, QVariant::fromValue(QDBusVariant(value)));
-    }
+        iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
+    }
+}
+
+void AccountsService::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
+{
+    // Merge changed and invalidated together
+    QStringList combined;
+    combined << invalid;
+    combined << changed.keys();
+    combined.removeDuplicates();
+
+    Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
+}
+
+void AccountsService::maybeChangedSlot()
+{
+    Q_EMIT maybeChanged(getUserForPath(message().path()));
+}
+
+QString AccountsService::getUserForPath(const QString &path)
+{
+    QMap<QString, QDBusInterface *>::const_iterator i;
+    for (i = users.constBegin(); i != users.constEnd(); ++i) {
+        if (i.value()->path() == path) {
+            return i.key();
+        }
+    }
+    return QString();
 }
 
 QDBusInterface *AccountsService::getUserInterface(const QString &user)
@@ -63,10 +90,35 @@
     if (iface == nullptr && accounts_manager->isValid()) {
         auto answer = accounts_manager->call("FindUserByName", user);
         if (answer.type() == QDBusMessage::ReplyMessage) {
+            auto path = answer.arguments()[0].value<QDBusObjectPath>().path();
+
             iface = new QDBusInterface("org.freedesktop.Accounts",
-                                       answer.arguments()[0].value<QDBusObjectPath>().path(),
+                                       path,
                                        "org.freedesktop.DBus.Properties",
                                        accounts_manager->connection(), this);
+
+            // With its own pre-defined properties, AccountsService is oddly
+            // close-lipped.  It won't send out proper DBus.Properties notices,
+            // but it does have one catch-all Changed() signal.  So let's
+            // listen to that.
+            iface->connection().connect(
+                iface->service(),
+                path,
+                "org.freedesktop.Accounts.User",
+                "Changed",
+                this,
+                SLOT(maybeChangedSlot()));
+
+            // But custom properties do send out the right notifications, so
+            // let's still listen there.
+            iface->connection().connect(
+                iface->service(),
+                path,
+                "org.freedesktop.DBus.Properties",
+                "PropertiesChanged",
+                this,
+                SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));
+
             users.insert(user, iface);
         }
     }

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2013-08-27 17:29:16 +0000
+++ plugins/AccountsService/AccountsService.h	2013-09-05 17:32:14 +0000
@@ -19,23 +19,33 @@
 #ifndef UNITY_ACCOUNTSSERVICE_H
 #define UNITY_ACCOUNTSSERVICE_H
 
+#include <QDBusContext>
 #include <QDBusInterface>
 #include <QMap>
 #include <QObject>
 #include <QString>
 
-class AccountsService: public QObject
+class AccountsService: public QObject, public QDBusContext
 {
     Q_OBJECT
 
 public:
     explicit AccountsService(QObject *parent = 0);
 
-    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
-    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
+    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);
+    Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
+
+Q_SIGNALS:
+    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
+    void maybeChanged(const QString &user); // Standard properties might have changed
+
+private Q_SLOTS:
+    void propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
+    void maybeChangedSlot();
 
 private:
     QDBusInterface *getUserInterface(const QString &user);
+    QString getUserForPath(const QString &path);
 
     QDBusInterface *accounts_manager;
     QMap<QString, QDBusInterface *> users;

=== modified file 'plugins/AccountsService/CMakeLists.txt'
--- plugins/AccountsService/CMakeLists.txt	2013-08-22 20:16:41 +0000
+++ plugins/AccountsService/CMakeLists.txt	2013-09-05 17:32:14 +0000
@@ -3,6 +3,7 @@
 add_definitions(-DSM_BUSNAME=systemBus)
 
 add_library(AccountsService-qml MODULE
+    AccountsBindings.cpp
     AccountsService.cpp
     plugin.cpp
     )

=== modified file 'plugins/AccountsService/plugin.cpp'
--- plugins/AccountsService/plugin.cpp	2013-08-25 21:00:47 +0000
+++ plugins/AccountsService/plugin.cpp	2013-09-05 17:32:14 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "plugin.h"
-#include "AccountsService.h"
+#include "AccountsBindings.h"
 
 #include <QDBusMetaType>
 #include <QtQml>
@@ -26,12 +26,12 @@
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
-    return new AccountsService();
+    return new AccountsBindings();
 }
 
 void AccountsServicePlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("AccountsService"));
     qDBusRegisterMetaType<QList<QVariantMap>>();
-    qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);
+    qmlRegisterSingletonType<AccountsBindings>(uri, 0, 1, "AccountsService", service_provider);
 }

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 16:01:00 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 17:32:14 +0000
@@ -213,8 +213,13 @@
 
     m_storedApps.clear();
 
+<<<<<<< TREE
     if (m_accounts && !m_user.isEmpty()) {
         QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");
+=======
+    if (m_user != "" && m_accounts != nullptr) {
+        auto variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
+>>>>>>> MERGE-SOURCE
         apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
         defaults = isDefaultsItem(apps);
     }
@@ -257,7 +262,7 @@
             items << itemToVariant(appId);
         }
 
-        m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
+        m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
     }
 }
 

=== renamed file 'tests/mocks/AccountsService/AccountsService.cpp' => 'tests/mocks/AccountsService/AccountsBindings.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2013-08-02 20:03:16 +0000
+++ tests/mocks/AccountsService/AccountsBindings.cpp	2013-09-05 17:32:14 +0000
@@ -16,18 +16,39 @@
  * Author: Michael Terry <[e-mail]>
  */
 
-#include "AccountsService.h"
-
-AccountsService::AccountsService(QObject* parent)
-  : QObject(parent)
-{
-}
-
-QVariant AccountsService::getUserProperty(const QString &, const QString &)
-{
-    return QVariant(false);
-}
-
-void AccountsService::setUserProperty(const QString &, const QString &, const QVariant &)
-{
+#include "AccountsBindings.h"
+
+AccountsBindings::AccountsBindings(QObject* parent)
+  : QObject(parent),
+    m_statsWelcomeScreen(true)
+{
+}
+
+void AccountsBindings::setUser(const QString &)
+{
+}
+
+bool AccountsBindings::getDemoEdges()
+{
+    return false;
+}
+
+void AccountsBindings::setDemoEdges(bool)
+{
+}
+
+QString AccountsBindings::getBackgroundFile()
+{
+    return TOP_SRCDIR "/graphics/phone_background.jpg";
+}
+
+bool AccountsBindings::getStatsWelcomeScreen()
+{
+    return m_statsWelcomeScreen;
+}
+
+void AccountsBindings::setStatsWelcomeScreen(bool statsWelcomeScreen)
+{
+    m_statsWelcomeScreen = statsWelcomeScreen;
+    statsWelcomeScreenChanged();
 }

=== renamed file 'tests/mocks/AccountsService/AccountsService.h' => 'tests/mocks/AccountsService/AccountsBindings.h'
--- tests/mocks/AccountsService/AccountsService.h	2013-08-27 17:34:46 +0000
+++ tests/mocks/AccountsService/AccountsBindings.h	2013-09-05 17:32:14 +0000
@@ -17,22 +17,46 @@
  *          Michael Terry <[e-mail]>
  */
 
-#ifndef UNITY_MOCK_ACCOUNTSSERVICE_H
-#define UNITY_MOCK_ACCOUNTSSERVICE_H
+#ifndef UNITY_MOCK_ACCOUNTSBINDINGS_H
+#define UNITY_MOCK_ACCOUNTSBINDINGS_H
 
 #include <QObject>
 #include <QString>
 #include <QVariant>
 
-class AccountsService: public QObject
+class AccountsBindings: public QObject
 {
     Q_OBJECT
+    Q_PROPERTY (bool demoEdges
+                READ getDemoEdges
+                WRITE setDemoEdges
+                NOTIFY demoEdgesChanged)
+    Q_PROPERTY (QString backgroundFile
+                READ getBackgroundFile
+                NOTIFY backgroundFileChanged)
+    Q_PROPERTY (bool statsWelcomeScreen
+                READ getStatsWelcomeScreen
+                WRITE setStatsWelcomeScreen // addition for testing
+                NOTIFY statsWelcomeScreenChanged)
 
 public:
-    explicit AccountsService(QObject *parent = 0);
-
-    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
-    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
+    explicit AccountsBindings(QObject *parent = 0);
+
+    Q_INVOKABLE void setUser(const QString &user);
+
+    bool getDemoEdges();
+    void setDemoEdges(bool demoEdges);
+    QString getBackgroundFile();
+    bool getStatsWelcomeScreen();
+    void setStatsWelcomeScreen(bool statsWelcomeScreen);
+
+Q_SIGNALS:
+    void demoEdgesChanged();
+    void backgroundFileChanged();
+    void statsWelcomeScreenChanged();
+
+private:
+    bool m_statsWelcomeScreen;
 };
 
 #endif

=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2013-07-30 23:22:48 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2013-09-05 17:32:14 +0000
@@ -1,5 +1,7 @@
+add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")
+
 add_library(MockAccountsService-qml MODULE
-    AccountsService.cpp
+    AccountsBindings.cpp
     plugin.cpp
     )
 

=== modified file 'tests/mocks/AccountsService/plugin.cpp'
--- tests/mocks/AccountsService/plugin.cpp	2013-08-27 17:34:46 +0000
+++ tests/mocks/AccountsService/plugin.cpp	2013-09-05 17:32:14 +0000
@@ -18,7 +18,7 @@
  */
 
 #include "plugin.h"
-#include "AccountsService.h"
+#include "AccountsBindings.h"
 
 #include <QtQml>
 
@@ -26,11 +26,11 @@
 {
     Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
-    return new AccountsService();
+    return new AccountsBindings();
 }
 
 void AccountsServicePlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("AccountsService"));
-    qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);
+    qmlRegisterSingletonType<AccountsBindings>(uri, 0, 1, "AccountsService", service_provider);
 }

=== 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-09-05 17:32:14 +0000
@@ -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/plugins/AccountsService/CMakeLists.txt'
--- tests/plugins/AccountsService/CMakeLists.txt	2013-08-13 23:35:31 +0000
+++ tests/plugins/AccountsService/CMakeLists.txt	2013-09-05 17:32:14 +0000
@@ -25,6 +25,7 @@
 
 add_executable(test-accountsservice
     ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsBindings.cpp
     client.cpp
     )
 qt5_use_modules(test-accountsservice Core DBus Test)

=== modified file 'tests/plugins/AccountsService/client.cpp'
--- tests/plugins/AccountsService/client.cpp	2013-08-22 14:54:08 +0000
+++ tests/plugins/AccountsService/client.cpp	2013-09-05 17:32:14 +0000
@@ -17,6 +17,7 @@
  * Authored by: Michael Terry <[e-mail]>
  */
 
+#include "AccountsBindings.h"
 #include "AccountsService.h"
 #include <QSignalSpy>
 #include <QTest>
@@ -31,16 +32,27 @@
     {
         // Test various invalid calls
         AccountsService session;
-        QCOMPARE(session.getUserProperty("NOPE", "demo-edges"), QVariant());
-        QCOMPARE(session.getUserProperty("testuser", "NOPE"), QVariant());
+        QCOMPARE(session.getUserProperty("NOPE", "com.canonical.unity.AccountsService", "demo-edges"), QVariant());
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "NOPE"), QVariant());
     }
 
-    void testGetSet()
+    void testGetSetService()
     {
         AccountsService session;
-        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(true));
-        session.setUserProperty("testuser", "demo-edges", QVariant(false));
-        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(false));
+        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(true));
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(true));
+        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(false));
+        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(false));
+    }
+
+    void testGetSetBindings()
+    {
+        AccountsBindings bindings;
+        bindings.setUser("testuser");
+        bindings.setDemoEdges(true);
+        QCOMPARE(bindings.getDemoEdges(), true);
+        bindings.setDemoEdges(false);
+        QCOMPARE(bindings.getDemoEdges(), false);
     }
 };
 

=== 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-09-05 17:32:14 +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-06-28 16:39:22 +0000
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-09-05 17:32:14 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components 0.1
 import LightDM 0.1 as LightDM
 import Unity.Test 0.1 as UT
+import AccountsService 0.1
 
 Item {
     width: units.gu(60)
@@ -51,6 +52,10 @@
         name: "Greeter"
         when: windowShown
 
+        function cleanup() {
+            AccountsService.statsWelcomeScreen = true
+        }
+
         function test_properties() {
             compare(greeter.multiUser, false)
             compare(greeter.narrowMode, true)
@@ -102,5 +107,15 @@
             // Wait until we're back to 0
             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")
+        }
     }
 }