Merge lp:~saviq/unity8/fix-shellwithpin-test into lp:unity8

[Michał Sawicz]

Fix the ShellWithPin test and some functionality.

Top element can't be a positioner because popups and such anchor to it, breaking badly.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[Michael Zanetti (mzanetti)]

ack, cheers,

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

waiting

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[Daniel d'Andrada (dandrader)]

What about https://code.launchpad.net/~mterry/unity8/fix-shellwithpin/+merge/237849 ?

[Daniel d'Andrada (dandrader)]

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1355
http://jenkins.qa.ubuntu.com/job/unity8-ci/4602/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5796/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1588/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1696
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5452/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7048
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7048/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14487

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

> What about https://code.launchpad.net/~mterry/unity8/fix-
> shellwithpin/+merge/237849 ?

Hmm I missed that, but it wasn't enough anyway. The test passed, but you couldn't see it because Row complained that it won't work (Popup tried to fill Row).

[Daniel d'Andrada (dandrader)]

> > What about https://code.launchpad.net/~mterry/unity8/fix-
> > shellwithpin/+merge/237849 ?
>
> Hmm I missed that, but it wasn't enough anyway. The test passed, but you
> couldn't see it because Row complained that it won't work (Popup tried to fill
> Row).

Could you please absorb its changes (s/mouseClick/tap and the tap() improvements)?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1355
http://jenkins.qa.ubuntu.com/job/unity8-ci/4606/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5812/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1700
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5465/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7064/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14501

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

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/fix-shellwithpin-test]

1356. By Michał Sawicz on 2014-10-10

Improve the tap() method

[Michał Sawicz (saviq)]

W dniu 10.10.2014 o 14:11, Daniel d'Andrada pisze:
> Could you please absorb its changes (s/mouseClick/tap and the tap() improvements)?

Yeah, done.

[Daniel d'Andrada (dandrader)]

"""
123 - mouseClick(button, units.gu(1), units.gu(1))
124 + mouseClick(button, button.width / 2, button.height / 2)
"""

This part could use the new tap() as well.

review: Needs Fixing

[lp:~saviq/unity8/fix-shellwithpin-test]

1357. By Michał Sawicz on 2014-10-10

Use tap() everywhere in the touched file.

[Michał Sawicz (saviq)]

W dniu 10.10.2014 o 16:25, Daniel d'Andrada pisze:
> This part could use the new tap() as well.

Right, I shouldn't have touched the other... Replaced all of them, then.

[Daniel d'Andrada (dandrader)]

> W dniu 10.10.2014 o 16:25, Daniel d'Andrada pisze:
> > This part could use the new tap() as well.
>
> Right, I shouldn't have touched the other... Replaced all of them, then.

Thanks!

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1356
http://jenkins.qa.ubuntu.com/job/unity8-ci/4611/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5822/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1705
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7074
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7074/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14516

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1357
http://jenkins.qa.ubuntu.com/job/unity8-ci/4616/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1710
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7086
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14527

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Indicators/indicator.cpp'
--- plugins/Unity/Indicators/indicator.cpp	2013-10-10 15:55:20 +0000
+++ plugins/Unity/Indicators/indicator.cpp	2014-10-13 08:36:39 +0000
@@ -31,24 +31,26 @@
 {
 }
 
-void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)
+void Indicator::init(const QString& busName, const QSettings& settings)
 {
+    // Save all keys we care about from the QSettings object.  It's annoying
+    // that we can't just copy the object.
+    m_settings.clear();
+    Q_FOREACH(const QString& key, settings.allKeys()) {
+        if (key.endsWith("/Position") || key.endsWith("/ObjectPath")) {
+            m_settings.insert(key, settings.value(key));
+        }
+    }
+
     setId(settings.value("Indicator Service/Name").toString());
 
-    QVariant pos = settings.value(profile + "/Position");
-    if (!pos.isValid())
-        pos = settings.value("Indicator Service/Position", QVariant::fromValue(0));
-    setPosition(pos.toInt());
-
     QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
-    QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();
 
     QVariantMap properties;
     properties.clear();
     properties.insert("busType", 1);
     properties.insert("busName", busName);
     properties.insert("actionsObjectPath", actionObjectPath);
-    properties.insert("menuObjectPath", menuObjectPath);
     setIndicatorProperties(properties);
 }
 
@@ -78,6 +80,19 @@
     }
 }
 
+void Indicator::setProfile(const QString& profile)
+{
+    QVariant pos = m_settings.value(profile + "/Position");
+    if (!pos.isValid())
+        pos = m_settings.value("Indicator Service/Position", QVariant::fromValue(0));
+    setPosition(pos.toInt());
+
+    QString menuObjectPath = m_settings.value(profile + "/ObjectPath").toString();
+    QVariantMap map = m_properties.toMap();
+    map.insert("menuObjectPath", menuObjectPath);
+    setIndicatorProperties(map);
+}
+
 QVariant Indicator::indicatorProperties() const
 {
     return m_properties;

=== modified file 'plugins/Unity/Indicators/indicator.h'
--- plugins/Unity/Indicators/indicator.h	2013-10-10 15:47:40 +0000
+++ plugins/Unity/Indicators/indicator.h	2014-10-13 08:36:39 +0000
@@ -35,12 +35,15 @@
     Indicator(QObject *parent = 0);
     virtual ~Indicator();
 
-    void init(const QString &profile, const QString& busName, const QSettings& settings);
+    void init(const QString& busName, const QSettings& settings);
 
     QString identifier() const;
     int position() const;
     QVariant indicatorProperties() const;
 
+public Q_SLOTS:
+    void setProfile(const QString& profile);
+
 Q_SIGNALS:
     void identifierChanged(const QString &identifier);
     void positionChanged(int position);
@@ -55,6 +58,7 @@
     QString m_identifier;
     int m_position;
     QVariant m_properties;
+    QVariantMap m_settings;
 };
 
 #endif // INDICATOR_H

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2014-04-18 17:04:59 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2014-10-13 08:36:39 +0000
@@ -57,7 +57,7 @@
 void IndicatorsManager::load(const QString& profile)
 {
     unload();
-    m_profile = profile;
+    setProfile(profile);
 
     QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
 
@@ -216,6 +216,19 @@
     }
 }
 
+QString IndicatorsManager::profile() const
+{
+    return m_profile;
+}
+
+void IndicatorsManager::setProfile(const QString& profile)
+{
+    if (m_profile != profile) {
+        m_profile = profile;
+        Q_EMIT profileChanged(m_profile);
+    }
+}
+
 void IndicatorsManager::startVerify(const QString& path)
 {
     QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
@@ -268,7 +281,9 @@
     Indicator::Ptr new_indicator(new Indicator(this));
     data->m_indicator = new_indicator;
     QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
-    new_indicator->init(m_profile, data->m_fileInfo.fileName(), settings);
+    new_indicator->init(data->m_fileInfo.fileName(), settings);
+    new_indicator->setProfile(m_profile);
+    QObject::connect(this, SIGNAL(profileChanged(const QString&)), new_indicator.data(), SLOT(setProfile(const QString&)));
     return new_indicator;
 }
 

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.h'
--- plugins/Unity/Indicators/indicatorsmanager.h	2014-04-09 14:51:09 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.h	2014-10-13 08:36:39 +0000
@@ -32,6 +32,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
+    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
 public:
     explicit IndicatorsManager(QObject* parent = 0);
     ~IndicatorsManager();
@@ -39,6 +40,9 @@
     Q_INVOKABLE void load(const QString& profile);
     Q_INVOKABLE void unload();
 
+    QString profile() const;
+    void setProfile(const QString& profile);
+
     Indicator::Ptr indicator(const QString& indicator_name);
 
     QList<Indicator::Ptr> indicators();
@@ -47,6 +51,7 @@
 
 Q_SIGNALS:
     void loadedChanged(bool);
+    void profileChanged(const QString&);
 
     void indicatorLoaded(const QString& indicator_name);
     void indicatorAboutToBeUnloaded(const QString& indicator_name);

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.cpp'
--- plugins/Unity/Indicators/indicatorsmodel.cpp	2014-01-30 14:54:01 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.cpp	2014-10-13 08:36:39 +0000
@@ -56,6 +56,7 @@
     m_manager = new IndicatorsManager(this);
     QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));
     QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));
+    QObject::connect(m_manager, SIGNAL(profileChanged(const QString&)), this, SIGNAL(profileChanged()));
 
     QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
     QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
@@ -81,6 +82,28 @@
 }
 
 /*!
+    \qmlproperty IndicatorsModel::profile
+    The indicator profile to use for the model.
+
+    \b Note: methods should only be called after the Component has completed.
+*/
+QString IndicatorsModel::profile() const
+{
+    return m_manager->profile();
+}
+
+/*!
+    \qmlproperty IndicatorsModel::setProfile
+    Set the indicator profile to use for the model.
+
+    \b Note: methods should only be called after the Component has completed.
+*/
+void IndicatorsModel::setProfile(const QString &profile)
+{
+    m_manager->setProfile(profile);
+}
+
+/*!
     \qmlmethod IndicatorsModel::unload()
 
     Load all indicators.

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.h'
--- plugins/Unity/Indicators/indicatorsmodel.h	2014-01-30 14:54:01 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.h	2014-10-13 08:36:39 +0000
@@ -34,6 +34,7 @@
     Q_OBJECT
     Q_ENUMS(Roles)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
 
 public:
 
@@ -45,6 +46,9 @@
 
     Q_INVOKABLE QVariant data(int row, int role) const;
 
+    QString profile() const;
+    void setProfile(const QString& profile);
+
     /* QAbstractItemModel */
     QHash<int, QByteArray> roleNames() const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -55,6 +59,7 @@
 
 Q_SIGNALS:
     void countChanged();
+    void profileChanged();
     void indicatorDataChanged(const QVariant& data);
 
 private Q_SLOTS:

=== modified file 'plugins/Unity/Indicators/rootactionstate.cpp'
--- plugins/Unity/Indicators/rootactionstate.cpp	2014-08-26 08:14:44 +0000
+++ plugins/Unity/Indicators/rootactionstate.cpp	2014-10-13 08:36:39 +0000
@@ -110,15 +110,17 @@
         m_cachedState = m_menu->get(0, "actionState").toMap();
 
         m_menu->setActionStateParser(oldParser);
-    } else {
+    } else if (!m_menu) {
         m_cachedState.clear();
     }
+    // else if m_menu->rowCount() == 0, let's leave existing cache in place
+    // until the new menu comes in, to avoid flashing the UI empty for a moment
     Q_EMIT updated();
 }
 
 bool RootActionState::isValid() const
 {
-    return m_menu && m_menu->rowCount() > 0;
+    return !m_cachedState.empty();
 }
 
 QString RootActionState::title() const

=== modified file 'plugins/Unity/Indicators/unitymenumodelcache.cpp'
--- plugins/Unity/Indicators/unitymenumodelcache.cpp	2014-08-20 09:16:28 +0000
+++ plugins/Unity/Indicators/unitymenumodelcache.cpp	2014-10-13 08:36:39 +0000
@@ -36,13 +36,12 @@
     if (m_registry.contains(path))
         return m_registry[path];
 
-    UnityMenuModel* menuModel = new UnityMenuModel;
-    connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {
-        QList<QByteArray> keys = m_registry.keys(menuModel);
-        Q_FOREACH(const QByteArray& key, keys) {
-            m_registry.remove(key);
-        }
-    });
+    // Parent the model to us, so it is not deleted by Qml.  We want to keep
+    // all models cached, because when we switch indicator profiles, we will
+    // be switching paths often.  And we want to keep the old model around,
+    // ready to be used.  Otherwise the UI might momentarily wait as we
+    // populate the model from DBus yet again.
+    UnityMenuModel* menuModel = new UnityMenuModel(this);
     m_registry[path] = menuModel;
 
     menuModel->setBusName(bus);

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2014-09-29 10:24:58 +0000
+++ qml/Panel/IndicatorItem.qml	2014-10-13 08:36:39 +0000
@@ -31,7 +31,7 @@
     opacity: dimmed ? 0.4 : 1
     Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration } }
 
-    onLoaded: {
+    function updateProperties() {
         for(var pName in indicatorProperties) {
             if (item.hasOwnProperty(pName)) {
                 item[pName] = indicatorProperties[pName];
@@ -39,6 +39,14 @@
         }
     }
 
+    onLoaded: updateProperties()
+
+    onIndicatorPropertiesChanged: {
+        if (status === Loader.Ready) {
+            updateProperties();
+        }
+    }
+
     Binding {
         target: item
         property: "identifier"

=== modified file 'qml/Panel/Indicators.qml'
--- qml/Panel/Indicators.qml	2014-09-09 13:40:41 +0000
+++ qml/Panel/Indicators.qml	2014-10-13 08:36:39 +0000
@@ -30,8 +30,7 @@
     property int panelHeight: units.gu(3)
     property alias overFlowWidth: indicatorRow.overFlowWidth
     property alias showAll: indicatorRow.showAll
-    // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)
-    property string profile: indicatorProfile
+    property alias profile: visibleIndicators.profile
 
     readonly property real hintValue: panelHeight + menuContent.headerHeight
     readonly property int lockThreshold: openedHeight / 2
@@ -171,6 +170,7 @@
 
     VisibleIndicators {
         id: visibleIndicators
+        objectName: "visibleIndicators"
     }
 
     MenuContent {

=== modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
--- qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-08-20 08:39:09 +0000
+++ qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-10-13 08:36:39 +0000
@@ -113,7 +113,8 @@
 
         leftLabel = rootActionState.leftLabel ? rootActionState.leftLabel : "";
         rightLabel = rootActionState.rightLabel ? rootActionState.rightLabel : "";
-        icons = rootActionState.icons;
+        if (icons !== rootActionState.icons) // don't reset visual unless we need to
+            icons = rootActionState.icons;
         enabled = rootActionState.visible;
     }
 }

=== modified file 'qml/Panel/Indicators/VisibleIndicators.qml'
--- qml/Panel/Indicators/VisibleIndicators.qml	2014-09-29 10:24:58 +0000
+++ qml/Panel/Indicators/VisibleIndicators.qml	2014-10-13 08:36:39 +0000
@@ -23,6 +23,7 @@
 
 Item {
     property SortFilterProxyModel model: filterModel
+    property alias profile: indicatorsModel.profile
 
     SortFilterProxyModel {
         id: filterModel
@@ -56,15 +57,25 @@
             id: item
             objectName: model.identifier + "-delegate"
             identifier: model.identifier
-            Component.onCompleted: {
+
+            function updateProperties() {
                 for(var pName in indicatorProperties) {
                     if (item.hasOwnProperty(pName)) {
                         item[pName] = indicatorProperties[pName];
                     }
                 }
+            }
+
+            Component.onCompleted: {
+                updateProperties();
                 updateVisibility();
             }
 
+            Connections {
+                target: indicatorsModel
+                onDataChanged: item.updateProperties()
+            }
+
             onEnabledChanged: {
                 updateVisibility()
             }

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-09-29 10:24:58 +0000
+++ qml/Panel/MenuContent.qml	2014-10-13 08:36:39 +0000
@@ -69,13 +69,20 @@
 
             IndicatorDelegate {
                 id: indicatorDelegate
-                Component.onCompleted: {
+
+                function updateProperties() {
                     for(var pName in indicatorProperties) {
                         if (indicatorDelegate.hasOwnProperty(pName)) {
                             indicatorDelegate[pName] = indicatorProperties[pName];
                         }
                     }
                 }
+
+                Component.onCompleted: updateProperties()
+                Connections {
+                    target: content.indicatorsModel
+                    onDataChanged: indicatorDelegate.updateProperties()
+                }
             }
         }
     }
@@ -115,7 +122,7 @@
                 }
             }
 
-            onLoaded: {
+            function updateProperties() {
                 for(var pName in indicatorProperties) {
                     if (item.hasOwnProperty(pName)) {
                         item[pName] = indicatorProperties[pName]
@@ -123,6 +130,12 @@
                 }
             }
 
+            onLoaded: updateProperties()
+            Connections {
+                target: content.indicatorsModel
+                onDataChanged: if (loader.status === Loader.Ready) loader.updateProperties()
+            }
+
             Binding {
                 target: loader.item
                 property: "identifier"

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-08 20:36:48 +0000
+++ qml/Shell.qml	2014-10-13 08:36:39 +0000
@@ -614,6 +614,9 @@
                 contentEnabled: edgeDemo.panelContentEnabled
                 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
                 panelHeight: units.gu(3)
+
+                // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)
+                profile: LightDM.Greeter.active ? (indicatorProfile + "_greeter") : indicatorProfile
             }
 
             property bool topmostApplicationIsFullscreen:

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-07-01 09:49:24 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-10-13 08:36:39 +0000
@@ -21,7 +21,8 @@
 #include "indicators.h"
 
 FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)
-    : QAbstractListModel(parent)
+    : QAbstractListModel(parent),
+      m_profile("phone")
 {
     QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
     QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
@@ -39,6 +40,17 @@
     return rowCount();
 }
 
+QString FakeIndicatorsModel::profile() const
+{
+    return m_profile;
+}
+
+void FakeIndicatorsModel::setProfile(const QString& profile)
+{
+    m_profile = profile;
+    Q_EMIT profileChanged();
+}
+
 void FakeIndicatorsModel::load(const QString&)
 {
 }

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-03-03 12:01:09 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-10-13 08:36:39 +0000
@@ -27,6 +27,7 @@
     Q_OBJECT
     Q_ENUMS(Roles)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
 public:
 
     FakeIndicatorsModel(QObject *parent=0);
@@ -39,6 +40,9 @@
 
     Q_INVOKABLE QVariant data(int row, int role) const;
 
+    QString profile() const;
+    void setProfile(const QString& profile);
+
     /* QAbstractItemModel */
     QHash<int, QByteArray> roleNames() const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -48,12 +52,14 @@
 
 Q_SIGNALS:
     void countChanged();
+    void profileChanged();
 
 private:
     int count() const;
 
     typedef QHash<int, QVariant> Indicator;
     QList<Indicator*> m_indicators;
+    QString m_profile;
 };
 
 #endif // FAKE_INDICATORSMODEL_H

=== modified file 'tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml'
--- tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	2014-08-20 09:16:28 +0000
+++ tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	2014-10-13 08:36:39 +0000
@@ -122,10 +122,10 @@
             return cachedObject2;
         }
 
-        function test_destroyAllDeletesModel() {
+        function test_destroyAllKeepsModel() {
             createAndDestroy("test6");
             doGC();
-            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);
+            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), true);
         }
 
         function test_destroyPartialKeepsModel() {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-10-06 16:39:10 +0000
+++ tests/qmltests/tst_Shell.qml	2014-10-13 08:36:39 +0000
@@ -65,6 +65,7 @@
         property bool itemDestroyed: false
         sourceComponent: Component {
             Shell {
+                property string indicatorProfile: "phone"
                 Component.onDestruction: {
                     shellLoader.itemDestroyed = true;
                 }
@@ -446,6 +447,18 @@
                 && itemRectInShell.y + itemRectInShell.height <= shell.height;
         }
 
+        function test_greeterChangesIndicatorProfile() {
+            var visibleIndicators = findChild(shell, "visibleIndicators");
+            tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
+
+            var greeter = findChild(shell, "greeter");
+            greeter.show();
+            tryCompare(visibleIndicators, "profile", shell.indicatorProfile + "_greeter");
+
+            greeter.hide();
+            tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
+        }
+
         function test_focusRequestedHidesGreeter() {
             var greeter = findChild(shell, "greeter");
 

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-10-01 13:22:00 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-10-13 08:36:39 +0000
@@ -27,9 +27,10 @@
 
 import "../../qml"
 
-Row {
+Item {
     id: root
-    spacing: 0
+    width: contentRow.width
+    height: contentRow.height
 
     QtObject {
         id: applicationArguments
@@ -47,34 +48,37 @@
         }
     }
 
-    Loader {
-        id: shellLoader
-
-        width: units.gu(40)
-        height: units.gu(71)
-
-        property bool itemDestroyed: false
-        sourceComponent: Component {
-            Shell {
-                Component.onDestruction: {
-                    shellLoader.itemDestroyed = true
+    Row {
+        id: contentRow
+
+        Loader {
+            id: shellLoader
+
+            width: units.gu(40)
+            height: units.gu(71)
+
+            property bool itemDestroyed: false
+            sourceComponent: Component {
+                Shell {
+                    Component.onDestruction: {
+                        shellLoader.itemDestroyed = true
+                    }
+                    maxFailedLogins: maxRetriesTextField.text
+                    property string indicatorProfile: "phone"
                 }
-                maxFailedLogins: maxRetriesTextField.text
             }
         }
-    }
-
-    Rectangle {
-        color: "white"
-        width: units.gu(30)
-        height: shellLoader.height
-
-        Column {
-            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
-            spacing: units.gu(1)
-            Row {
-                anchors { left: parent.left; right: parent.right }
+
+        Rectangle {
+            color: "white"
+            width: units.gu(30)
+            height: shellLoader.height
+
+            Column {
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+                spacing: units.gu(1)
                 Button {
+                    anchors { left: parent.left; right: parent.right }
                     text: "Show Greeter"
                     onClicked: {
                         if (shellLoader.status !== Loader.Ready)
@@ -86,15 +90,15 @@
                         }
                     }
                 }
-            }
 
-            Label {
-                text: "Max retries:"
-                color: "black"
-            }
-            TextField {
-                id: maxRetriesTextField
-                text: "-1"
+                Label {
+                    text: "Max retries:"
+                    color: "black"
+                }
+                TextField {
+                    id: maxRetriesTextField
+                    text: "-1"
+                }
             }
         }
     }
@@ -111,6 +115,7 @@
     }
 
     UT.UnityTestCase {
+        id: testCase
         name: "ShellWithPin"
         when: windowShown
 
@@ -182,7 +187,7 @@
             for (var i = 0; i < pin.length; ++i) {
                 var character = pin.charAt(i)
                 var button = findChild(shell, "pinPadButton" + character)
-                mouseClick(button, units.gu(1), units.gu(1))
+                tap(button)
             }
         }
 
@@ -214,7 +219,7 @@
             var launcher = findChild(shell, "launcher")
             var stage = findChild(shell, "stage")
 
-            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+            tap(emergencyButton)
 
             tryCompare(greeter, "lockedApp", "dialer-app")
             tryCompare(greeter, "hasLockedApp", true)
@@ -241,7 +246,7 @@
         function test_emergencyCallCrash() {
             var lockscreen = findChild(shell, "lockscreen")
             var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
-            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+            tap(emergencyButton)
 
             tryCompare(lockscreen, "shown", false)
             killApps() // kill dialer-app, as if it crashed
@@ -251,7 +256,7 @@
         function test_emergencyCallAppLaunch() {
             var lockscreen = findChild(shell, "lockscreen")
             var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
-            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+            tap(emergencyButton)
 
             tryCompare(lockscreen, "shown", false)
             ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
@@ -296,7 +301,7 @@
 
             var dialog = findChild(root, "infoPopup")
             var button = findChild(dialog, "infoPopupOkButton")
-            mouseClick(button, units.gu(1), units.gu(1))
+            tap(button)
             tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
 
             tryCompare(resetSpy, "count", 0)

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-10-09 14:04:21 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-10-13 08:36:39 +0000
@@ -321,7 +321,16 @@
         event.commit()
     }
 
+    /*! \brief Tap the item with a touch event.
+
+      \param item The item to be tapped
+      \param x The x coordinate of the tap, defaults to horizontal center
+      \param y The y coordinate of the tap, defaults to vertical center
+     */
     function tap(item, x, y) {
+        if (typeof x !== "number") x = item.width / 2;
+        if (typeof y !== "number") y = item.height / 2;
+
         var root = fetchRootItem(item)
         var rootPoint = item.mapToItem(root, x, y)