Merge lp:~unity-team/unity8/rtm-14.09-staging into lp:unity8/rtm-14.09

[Michał Sawicz]

[ Albert Astals ]
* Fix i18n (LP: #1389165)

[ Michael Zanetti ]
* Fix DBusVariant conversion for launcher emblems (LP: #1387261)
* Fix desktop file encoding in launcher (LP: #1387083)

[ Alberto Aguirre ]
* Add audioRole to QtMultimedia mock
* Add a plugin to take screenshots on vol up + vol down

[ Nick Dedekind ]
* Reset current item selection on deleted. (LP: #1378462)
* Added timer to re-assert server value after indicator menu item
  activation. (LP: #1336715)

[ Mirco Müller ]
* Added dedicated swipe-to-act button for snap-decisions, which avoids
  accidental taps/button-presses. (LP: #1358343)

[ Michael Terry ]
* Don't lock phone if user tries to switch back to an active call.
  (LP: #1388156)

[ Daniel d'Andrada ]
* TouchDispatcher: synthesize MouseButtonDblClick events (LP: #1388359)

[kevin gunn (kgunn72)]

deemed good to go through a lot of testing

review: Approve

[lp:~unity-team/unity8/rtm-14.09-staging]

1397. By Michael Terry on 2014-11-05

[ Albert Astals ]
* Fix i18n (LP: #1389165)

[ Michael Zanetti ]
* Fix DBusVariant conversion for launcher emblems (LP: #1387261)
* Fix desktop file encoding in launcher (LP: #1387083)

[ Alberto Aguirre ]
* Add audioRole to QtMultimedia mock
* Add a plugin to take screenshots on vol up + vol down

[ Nick Dedekind ]
* Reset current item selection on deleted. (LP: #1378462)
* Added timer to re-assert server value after indicator menu item
  activation. (LP: #1336715)

[ Mirco Müller ]
* Added dedicated swipe-to-act button for snap-decisions, which avoids
  accidental taps/button-presses. (LP: #1358343)

[ Michael Terry ]
* Don't lock phone if user tries to switch back to an active call.
  (LP: #1388156)

[ Daniel d'Andrada ]
* TouchDispatcher: synthesize MouseButtonDblClick events (LP: #1388359) Fixes: 1336715, 1358343, 1378462, 1387083, 1387261, 1388156, 1388359, 1389165

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-30 21:43:43 +0000
+++ debian/changelog	2014-11-05 14:37:57 +0000
@@ -1,3 +1,40 @@
+unity8 (8.01.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Albert Astals ]
+  * Fix i18n (LP: #1389165)
+
+  [ Michael Zanetti ]
+  * Fix DBusVariant conversion for launcher emblems (LP: #1387261)
+  * Fix desktop file encoding in launcher (LP: #1387083)
+
+  [ Alberto Aguirre ]
+  * Add audioRole to QtMultimedia mock
+  * Add a plugin to take screenshots on vol up + vol down
+
+  [ Nick Dedekind ]
+  * Reset current item selection on deleted. (LP: #1378462)
+  * Added timer to re-assert server value after indicator menu item
+    activation. (LP: #1336715)
+
+  [ Mirco Müller ]
+  * Added dedicated swipe-to-act button for snap-decisions, which avoids
+    accidental taps/button-presses. (LP: #1358343)
+
+  [ Michael Terry ]
+  * Don't lock phone if user tries to switch back to an active call.
+    (LP: #1388156)
+
+  [ Daniel d'Andrada ]
+  * TouchDispatcher: synthesize MouseButtonDblClick events (LP:
+    #1388359)
+
+  [ Michał Sawicz ]
+  * Bump the version above the version synced from vivid, otherwise
+    train will generate a lower-than-archive version number.
+  * fix positive/negative answer order on the new swipe notification
+
+ -- Michał Sawicz <[e-mail]>  Wed, 05 Nov 2014 02:37:24 +0100
+
 unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium
 
   [ Michael Terry ]

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-10-06 15:45:25 +0000
+++ debian/unity8-private.install	2014-11-05 14:37:57 +0000
@@ -6,6 +6,7 @@
 usr/lib/*/unity8/qml/Lights
 usr/lib/*/unity8/qml/Powerd
 usr/lib/*/unity8/qml/SessionBroadcast
+usr/lib/*/unity8/qml/ScreenGrabber
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils

=== modified file 'libs/UbuntuGestures/DebugHelpers.cpp'
--- libs/UbuntuGestures/DebugHelpers.cpp	2014-10-17 11:01:53 +0000
+++ libs/UbuntuGestures/DebugHelpers.cpp	2014-11-05 14:37:57 +0000
@@ -83,7 +83,7 @@
         message.append("MouseButtonDblClick ");
         break;
     case QEvent::MouseMove:
-        message.append("MouseButtonMove ");
+        message.append("MouseMove ");
         break;
     default:
         message.append("INVALID_MOUSE_EVENT_TYPE ");

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-09-29 09:43:18 +0000
+++ plugins/CMakeLists.txt	2014-11-05 14:37:57 +0000
@@ -18,6 +18,7 @@
 add_subdirectory(Dash)
 add_subdirectory(Powerd)
 add_subdirectory(SessionBroadcast)
+add_subdirectory(ScreenGrabber)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== added directory 'plugins/ScreenGrabber'
=== added file 'plugins/ScreenGrabber/CMakeLists.txt'
--- plugins/ScreenGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/CMakeLists.txt	2014-11-05 14:37:57 +0000
@@ -0,0 +1,13 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(SCREENGRABBERSOURCES
+  screengrabber.cpp
+  plugin.cpp
+)
+
+add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})
+qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)
+
+add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)

=== added file 'plugins/ScreenGrabber/ScreenGrabber.qmltypes'
--- plugins/ScreenGrabber/ScreenGrabber.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/ScreenGrabber.qmltypes	2014-11-05 14:37:57 +0000
@@ -0,0 +1,17 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'
+
+Module {
+    Component {
+        name: "ScreenGrabber"
+        prototype: "QObject"
+        exports: ["ScreenGrabber/ScreenGrabber 0.1"]
+        exportMetaObjectRevisions: [0]
+        Method { name: "captureAndSave" }
+    }
+}

=== added file 'plugins/ScreenGrabber/plugin.cpp'
--- plugins/ScreenGrabber/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/plugin.cpp	2014-11-05 14:37:57 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2014 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: Alberto Aguirre <[e-mail]>
+ */
+
+#include "plugin.h"
+#include "screengrabber.h"
+
+#include <QtQml/qqml.h>
+
+void ScreenGrabberPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("ScreenGrabber"));
+    qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");
+}

=== added file 'plugins/ScreenGrabber/plugin.h'
--- plugins/ScreenGrabber/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/plugin.h	2014-11-05 14:37:57 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 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: Alberto Aguirre <[e-mail]>
+ */
+
+#ifndef SCREENGRABBER_PLUGIN_H
+#define SCREENGRABBER_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class ScreenGrabberPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // SCREENGRABBER_PLUGIN_H

=== added file 'plugins/ScreenGrabber/qmldir'
--- plugins/ScreenGrabber/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/qmldir	2014-11-05 14:37:57 +0000
@@ -0,0 +1,3 @@
+module ScreenGrabber
+plugin ScreenGrabber-qml
+typeinfo ScreenGrabber.qmltypes

=== added file 'plugins/ScreenGrabber/screengrabber.cpp'
--- plugins/ScreenGrabber/screengrabber.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/screengrabber.cpp	2014-11-05 14:37:57 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2014 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: Alberto Aguirre <[e-mail]>
+ */
+
+#include "screengrabber.h"
+
+#include <QDir>
+#include <QDateTime>
+#include <QStandardPaths>
+#include <QtGui/QImage>
+#include <QtGui/QGuiApplication>
+#include <QtQuick/QQuickWindow>
+#include <QtConcurrent/QtConcurrentRun>
+
+#include <QDebug>
+
+void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)
+{
+    if (!screenshot.save(filename, format.toLatin1().data(), quality))
+        qWarning() << "ScreenShotter: failed to save snapshot!";
+}
+
+ScreenGrabber::ScreenGrabber(QObject *parent)
+    : QObject(parent),
+      screenshotQuality(0)
+{
+    QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));
+    screenshotsDir.mkdir("Screenshots");
+    screenshotsDir.cd("Screenshots");
+    if (screenshotsDir.exists())
+    {
+        fileNamePrefix = screenshotsDir.absolutePath();
+        fileNamePrefix.append("/screenshot");
+    }
+    else
+    {
+        qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();
+    }
+}
+
+void ScreenGrabber::captureAndSave()
+{
+    if (fileNamePrefix.isEmpty())
+    {
+        qWarning() << "ScreenShotter: no directory to save screenshot";
+        return;
+    }
+
+    const QWindowList windows = QGuiApplication::topLevelWindows();
+    if (windows.empty())
+    {
+        qWarning() << "ScreenShotter: no top level windows found!";
+        return;
+    }
+
+    QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);
+    if (!main_window)
+    {
+        qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";
+        return;
+    }
+
+    QImage screenshot = main_window->grabWindow();
+    QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);
+}
+
+QString ScreenGrabber::makeFileName()
+{
+    QString fileName(fileNamePrefix);
+    fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));
+    fileName.append(".");
+    fileName.append(getFormat());
+    return fileName;
+}
+
+QString ScreenGrabber::getFormat()
+{
+    //TODO: This should be configurable (perhaps through gsettings?)
+    return "png";
+}

=== added file 'plugins/ScreenGrabber/screengrabber.h'
--- plugins/ScreenGrabber/screengrabber.h	1970-01-01 00:00:00 +0000
+++ plugins/ScreenGrabber/screengrabber.h	2014-11-05 14:37:57 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 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: Alberto Aguirre <[e-mail]>
+ */
+
+#ifndef SNAPSHOTTER_H
+#define SNAPSHOTTER_H
+
+#include <QObject>
+#include <QString>
+
+class ScreenGrabber: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ScreenGrabber(QObject *parent = 0);
+
+public Q_SLOTS:
+    void captureAndSave();
+
+private:
+    QString makeFileName();
+    QString getFormat();
+    QString fileNamePrefix;
+    int screenshotQuality;
+};
+
+#endif

=== modified file 'plugins/Ubuntu/Gestures/TouchDispatcher.cpp'
--- plugins/Ubuntu/Gestures/TouchDispatcher.cpp	2014-10-20 14:24:30 +0000
+++ plugins/Ubuntu/Gestures/TouchDispatcher.cpp	2014-11-05 14:37:57 +0000
@@ -16,7 +16,9 @@
 
 #include "TouchDispatcher.h"
 
+#include <QGuiApplication>
 #include <QScopedPointer>
+#include <QStyleHints>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-pedantic"
@@ -32,6 +34,7 @@
 TouchDispatcher::TouchDispatcher()
     : m_status(NoActiveTouch)
     , m_touchMouseId(-1)
+    , m_touchMousePressTimestamp(0)
 {
 }
 
@@ -148,6 +151,18 @@
             #endif
             m_status = DeliveringMouseEvents;
             m_touchMouseId = targetTouchPoints.at(0).id();
+
+            if (checkIfDoubleClicked(timestamp)) {
+                QScopedPointer<QMouseEvent> doubleClickEvent(
+                        touchToMouseEvent(QEvent::MouseButtonDblClick, targetTouchPoints.at(0), timestamp,
+                                          modifiers, false /* transformNeeded */));
+                #if TOUCHDISPATCHER_DEBUG
+                qDebug() << "[TouchDispatcher] dispatching" << qPrintable(mouseEventToString(doubleClickEvent.data()))
+                        << "to" << m_targetItem.data();
+                #endif
+                QCoreApplication::sendEvent(targetItem, doubleClickEvent.data());
+            }
+
         } else {
             #if TOUCHDISPATCHER_DEBUG
             qDebug() << "[TouchDispatcher] Item rejected the QMouseEvent.";
@@ -322,3 +337,31 @@
     //QGuiApplicationPrivate::setMouseEventSource(me, Qt::MouseEventSynthesizedByQt);
     return me;
 }
+
+/*
+    Copied from qquickwindow.cpp which has:
+    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies)
+    Under GPL 3.0 license.
+*/
+bool TouchDispatcher::checkIfDoubleClicked(ulong newPressEventTimestamp)
+{
+    bool doubleClicked;
+
+    if (m_touchMousePressTimestamp == 0) {
+        // just initialize the variable
+        m_touchMousePressTimestamp = newPressEventTimestamp;
+        doubleClicked = false;
+    } else {
+        ulong timeBetweenPresses = newPressEventTimestamp - m_touchMousePressTimestamp;
+        ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->
+                mouseDoubleClickInterval());
+        doubleClicked = timeBetweenPresses < doubleClickInterval;
+        if (doubleClicked) {
+            m_touchMousePressTimestamp = 0;
+        } else {
+            m_touchMousePressTimestamp = newPressEventTimestamp;
+        }
+    }
+
+    return doubleClicked;
+}

=== modified file 'plugins/Ubuntu/Gestures/TouchDispatcher.h'
--- plugins/Ubuntu/Gestures/TouchDispatcher.h	2014-10-17 11:01:53 +0000
+++ plugins/Ubuntu/Gestures/TouchDispatcher.h	2014-11-05 14:37:57 +0000
@@ -71,6 +71,8 @@
     QMouseEvent *touchToMouseEvent(QEvent::Type type, const QTouchEvent::TouchPoint &p,
             ulong timestamp, Qt::KeyboardModifiers modifiers, bool transformNeeded = true);
 
+    bool checkIfDoubleClicked(ulong newPressEventTimestamp);
+
     QPointer<QQuickItem> m_targetItem;
 
     enum {
@@ -81,6 +83,7 @@
     } m_status;
 
     int m_touchMouseId;
+    ulong m_touchMousePressTimestamp;
 };
 
 #endif // UBUNTU_TOUCH_DISPATCHER_H

=== modified file 'plugins/Unity/Launcher/dbusinterface.cpp'
--- plugins/Unity/Launcher/dbusinterface.cpp	2014-10-09 21:29:00 +0000
+++ plugins/Unity/Launcher/dbusinterface.cpp	2014-11-05 14:37:57 +0000
@@ -171,13 +171,13 @@
         }
     } else if (message.member() == "Set") {
         if (message.arguments()[1].toString() == "count") {
-            int newCount = message.arguments()[2].toInt();
+            int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
             if (!item || newCount != item->count()) {
                 Q_EMIT countChanged(appid, newCount);
                 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
             }
         } else if (message.arguments()[1].toString() == "countVisible") {
-            bool newVisible = message.arguments()[2].toBool();
+            bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
             if (!item || newVisible != item->countVisible()) {
                 Q_EMIT countVisibleChanged(appid, newVisible);
                 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);

=== modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
--- plugins/Unity/Launcher/desktopfilehandler.cpp	2014-09-30 16:48:28 +0000
+++ plugins/Unity/Launcher/desktopfilehandler.cpp	2014-11-05 14:37:57 +0000
@@ -106,6 +106,7 @@
     }
 
     QSettings settings(m_filename, QSettings::IniFormat);
+    settings.setIniCodec("UTF-8");
     settings.beginGroup("Desktop Entry");
 
     // First try to find Name[xx_YY] and Name[xx] in .desktop file
@@ -138,6 +139,7 @@
     }
 
     QSettings settings(m_filename, QSettings::IniFormat);
+    settings.setIniCodec("UTF-8");
     settings.beginGroup("Desktop Entry");
     QString iconString = settings.value("Icon").toString();
     QString pathString = settings.value("Path").toString();

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-10-07 08:41:28 +0000
+++ po/unity8.pot	2014-11-05 14:37:57 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-07 11:37+0300\n"
+"POT-Creation-Date: 2014-10-31 10:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -50,59 +50,59 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: qml/Components/Dialogs.qml:70
+#: qml/Components/Dialogs.qml:74
 msgid "Log out"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:71
+#: qml/Components/Dialogs.qml:75
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
-#: qml/Components/Dialogs.qml:122
+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
+#: qml/Components/Dialogs.qml:126
 msgid "No"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
-#: qml/Components/Dialogs.qml:129
+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
+#: qml/Components/Dialogs.qml:133
 msgid "Yes"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:94
+#: qml/Components/Dialogs.qml:98
 msgid "Shut down"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:95
+#: qml/Components/Dialogs.qml:99
 msgid "Are you sure you want to shut down?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:119
+#: qml/Components/Dialogs.qml:123
 msgid "Reboot"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:120
+#: qml/Components/Dialogs.qml:124
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:144
+#: qml/Components/Dialogs.qml:148
 msgid "Power"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:145
+#: qml/Components/Dialogs.qml:149
 msgid ""
 "Are you sure you would like\n"
 "to power off?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:147
+#: qml/Components/Dialogs.qml:151
 msgid "Power off"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:157
+#: qml/Components/Dialogs.qml:161
 msgid "Restart"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:167
+#: qml/Components/Dialogs.qml:171
 msgid "Cancel"
 msgstr ""
 
@@ -134,29 +134,33 @@
 msgid "Swipe up again to close the settings screen"
 msgstr ""
 
-#: qml/Components/EdgeDemo.qml:198
+#: qml/Components/EdgeDemo.qml:201
 msgid "Left edge"
 msgstr ""
 
-#: qml/Components/EdgeDemo.qml:199
+#: qml/Components/EdgeDemo.qml:202
 msgid "Swipe from the left to reveal the launcher for quick access to apps"
 msgstr ""
 
-#: qml/Components/EdgeDemo.qml:226
+#: qml/Components/EdgeDemo.qml:229
 msgid "Well done"
 msgstr ""
 
-#: qml/Components/EdgeDemo.qml:227
+#: qml/Components/EdgeDemo.qml:230
 msgid ""
 "You have now mastered the edge gestures and can start using the "
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:220
+#: qml/Components/Lockscreen.qml:223
+msgid "Return to Call"
+msgstr ""
+
+#: qml/Components/Lockscreen.qml:223
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:252
+#: qml/Components/Lockscreen.qml:255
 msgid "OK"
 msgstr ""
 
@@ -213,15 +217,15 @@
 msgid "Release to refresh…"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:206
+#: qml/Dash/ScopesOverview.qml:215
 msgid "Manage Scopes"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:428
+#: qml/Dash/ScopesOverview.qml:437
 msgid "Done"
 msgstr ""
 
-#: qml/Dash/ScopesOverview.qml:454
+#: qml/Dash/ScopesOverview.qml:463
 msgid "Store"
 msgstr ""
 
@@ -233,7 +237,7 @@
 msgid "All"
 msgstr ""
 
-#: qml/Greeter/Greeter.qml:157
+#: qml/Greeter/Greeter.qml:174
 msgid "Unlock"
 msgstr ""
 
@@ -261,39 +265,39 @@
 msgid "Show password"
 msgstr ""
 
-#: qml/Panel/ActiveCallHint.qml:77
+#: qml/Panel/ActiveCallHint.qml:79
 msgid "Tap to return to call..."
 msgstr ""
 
-#: qml/Panel/ActiveCallHint.qml:90
+#: qml/Panel/ActiveCallHint.qml:92
 msgid "Conference"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:600
+#: qml/Panel/Indicators/MenuItemFactory.qml:615
 msgid "Nothing is playing"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:748
+#: qml/Panel/Indicators/MenuItemFactory.qml:763
 msgid "In queue…"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:752
+#: qml/Panel/Indicators/MenuItemFactory.qml:767
 msgid "Downloading"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:754
+#: qml/Panel/Indicators/MenuItemFactory.qml:769
 msgid "Paused, tap to resume"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:756
+#: qml/Panel/Indicators/MenuItemFactory.qml:771
 msgid "Canceled"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:758
+#: qml/Panel/Indicators/MenuItemFactory.qml:773
 msgid "Finished"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:760
+#: qml/Panel/Indicators/MenuItemFactory.qml:775
 msgid "Failed, tap to retry"
 msgstr ""
 
@@ -305,55 +309,55 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:346
+#: qml/Shell.qml:381
 msgid "Enter passphrase"
 msgstr ""
 
-#: qml/Shell.qml:347
+#: qml/Shell.qml:382
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:348
+#: qml/Shell.qml:383
 msgid "Please re-enter"
 msgstr ""
 
-#: qml/Shell.qml:350
+#: qml/Shell.qml:385
 msgid "Enter passcode"
 msgstr ""
 
-#: qml/Shell.qml:351
+#: qml/Shell.qml:386
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:354
+#: qml/Shell.qml:389
 #, qt-format
 msgid "Enter %1"
 msgstr ""
 
-#: qml/Shell.qml:355
+#: qml/Shell.qml:390
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:390
+#: qml/Shell.qml:431
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:391
+#: qml/Shell.qml:432
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:392
+#: qml/Shell.qml:433
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:394
+#: qml/Shell.qml:435
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:395
+#: qml/Shell.qml:436
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'po/update-unity-pot'
--- po/update-unity-pot	2014-07-07 11:15:37 +0000
+++ po/update-unity-pot	2014-11-05 14:37:57 +0000
@@ -21,6 +21,7 @@
     --add-comments=TRANSLATORS \
     --keyword=tr \
     --keyword=tr:1,2 \
+    --keyword=dtr:2 \
     --package-name="unity8" \
     --copyright-holder="Canonical Ltd." \
     --from-code="UTF-8"

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2014-10-15 20:35:42 +0000
+++ qml/Components/Dialogs.qml	2014-11-05 14:37:57 +0000
@@ -26,7 +26,7 @@
 
     // Explicitly use the right domain for this widget because it might be used
     // in other applications like the welcome wizard.
-    property string domain: "unity8"
+    readonly property string domain: "unity8"
 
     function onPowerKeyPressed() {
         // FIXME: event.isAutoRepeat is always false on Nexus 4.

=== added file 'qml/Components/ScreenGrabber.qml'
--- qml/Components/ScreenGrabber.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ScreenGrabber.qml	2014-11-05 14:37:57 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+import QtQuick 2.0
+import QtMultimedia 5.0
+import ScreenGrabber 0.1
+
+Rectangle {
+    id: root
+    enabled: true
+    visible: false
+    color: "white"
+    anchors.fill: parent
+    opacity: 0.0
+
+    ScreenGrabber {
+        id: screenGrabber
+        objectName: "screenGrabber"
+    }
+
+    Audio {
+        id: shutterSound
+        audioRole: MediaPlayer.alert
+        source: "/system/media/audio/ui/camera_click.ogg"
+    }
+
+    function capture() {
+        if (!enabled)
+            return;
+
+        visible = true;
+        shutterSound.stop();
+        shutterSound.play();
+        fadeIn.start();
+    }
+
+    NumberAnimation on opacity {
+        id: fadeIn
+        from: 0.0
+        to: 1.0
+        onStopped: {
+            if (visible) {
+                fadeOut.start();
+            }
+        }
+    }
+
+    NumberAnimation on opacity {
+        id: fadeOut
+        from: 1.0
+        to: 0.0
+        onStopped: {
+            if (visible) {
+                screenGrabber.captureAndSave();
+                visible = false;
+            }
+        }
+    }
+}

=== added file 'qml/Components/VolumeKeyFilter.qml'
--- qml/Components/VolumeKeyFilter.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/VolumeKeyFilter.qml	2014-11-05 14:37:57 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+import QtQuick 2.0
+/*!
+ \brief A filter for volume keys
+
+A filter which treats volume keys as single tri-state key with the states:
+VolumeUp Pressed, VolumeDown Pressed or Volume Up+Down pressed
+*/
+QtObject {
+    id: root
+
+    signal volumeUpPressed()
+    signal volumeDownPressed()
+    signal bothVolumeKeysPressed()
+
+    property bool volumeUpKeyPressed: false
+    property bool volumeDownKeyPressed: false
+    property bool aVolumeKeyWasReleased: true
+
+    function onKeyPressed(key) {
+        if (key == Qt.Key_VolumeUp)
+            volumeUpKeyPressed = true;
+        else if (key == Qt.Key_VolumeDown)
+            volumeDownKeyPressed = true;
+
+        if (volumeDownKeyPressed && volumeUpKeyPressed) {
+            //avoids sending a signal repeatedly if both keys are held
+            //instead one of the keys must have been previously released
+            if (aVolumeKeyWasReleased)
+                bothVolumeKeysPressed();
+            aVolumeKeyWasReleased = false;
+        } else if (volumeDownKeyPressed) {
+            volumeDownPressed();
+        } else if (volumeUpKeyPressed) {
+            volumeUpPressed();
+        }
+    }
+
+    function onKeyReleased(key) {
+        if (key == Qt.Key_VolumeUp) {
+            volumeUpKeyPressed = false;
+            aVolumeKeyWasReleased = true;
+        } else if (key == Qt.Key_VolumeDown) {
+            volumeDownKeyPressed = false;
+            aVolumeKeyWasReleased = true;
+        }
+    }
+}

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2014-10-17 11:01:53 +0000
+++ qml/Greeter/Greeter.qml	2014-11-05 14:37:57 +0000
@@ -132,7 +132,7 @@
     TouchGate {
         targetItem: dragHandle
         anchors.fill: targetItem
-        enabled: targetITem.enabled
+        enabled: targetItem.enabled
     }
 
     Loader {

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2014-07-29 13:47:33 +0000
+++ qml/Greeter/Infographics.qml	2014-11-05 14:37:57 +0000
@@ -26,8 +26,15 @@
 
     property int animDuration: 10
 
-    property bool __useDotAnimation: true
-    property int __circleModifier: __useDotAnimation ? 1 : 2
+    QtObject {
+        id: d
+        objectName: "infographicPrivate"
+        property bool useDotAnimation: true
+        property int circleModifier: useDotAnimation ? 1 : 2
+        property bool animating: dotHideAnimTimer.running
+                              || dotShowAnimTimer.running
+                              || circleChangeAnimTimer.running
+    }
 
     Connections {
         target: model
@@ -46,7 +53,7 @@
         dotHideAnimTimer.stop()
         notification.hideAnim.stop()
 
-        if (__useDotAnimation) {
+        if (d.useDotAnimation) {
             dotShowAnimTimer.startFromBeginning()
         }
         notification.showAnim.start()
@@ -57,7 +64,7 @@
         circleChangeAnimTimer.stop()
         notification.showAnim.stop()
 
-        if (__useDotAnimation) {
+        if (d.useDotAnimation) {
             dotHideAnimTimer.startFromBeginning()
         } else {
             circleChangeAnimTimer.startFromBeginning()
@@ -148,21 +155,21 @@
                                 property: "opacity"
                                 to: pastCircle.circleOpacity
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                             PropertyAnimation {
                                 target: pastCircle
                                 property: "scale"
                                 to: modelData
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                             ColorAnimation {
                                 target: pastCircle
                                 property: "color"
                                 to: Gradient.threeColorByIndex(index, count, infographic.model.secondColor)
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                         }
                     }
@@ -209,21 +216,21 @@
                                 property: "opacity"
                                 to: presentCircle.circleOpacity
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                             PropertyAnimation {
                                 target: presentCircle
                                 property: "scale"
                                 to: modelData
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                             ColorAnimation {
                                 target: presentCircle
                                 property: "color"
                                 to: Gradient.threeColorByIndex(index, infographic.model.currentDay, infographic.model.firstColor)
                                 easing.type: Easing.OutCurve
-                                duration: circleChangeAnimTimer.interval * __circleModifier
+                                duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
                         }
                     }
@@ -385,7 +392,7 @@
                 from: notification.baseOpacity
                 to: 0.0
                 duration: notification.duration * dots.count
-                onStopped: if (!__useDotAnimation) infographic.model.readyForDataChange()
+                onStopped: if (!d.useDotAnimation) infographic.model.readyForDataChange()
             }
         }
     }
@@ -394,10 +401,8 @@
         anchors.fill: dataCircle
 
         onDoubleClicked: {
-            if (!dotHideAnimTimer.running &&
-                    !dotShowAnimTimer.running &&
-                    !circleChangeAnimTimer.running) {
-                __useDotAnimation = false
+            if (!d.animating) {
+                d.useDotAnimation = false
                 infographic.model.nextDataSource()
             }
         }

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-10-30 21:42:32 +0000
+++ qml/Notifications/Notification.qml	2014-11-05 14:37:57 +0000
@@ -398,7 +398,7 @@
 
                 spacing: contentSpacing
 
-                visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
+                visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3
 
                 Repeater {
                     id: oneOverTwoRepeaterTop
@@ -468,22 +468,41 @@
                 spacing: units.gu(2)
                 layoutDirection: Qt.RightToLeft
 
+                Loader {
+                    id: notifySwipeButtonLoader
+                    active: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
+
+                    sourceComponent: SwipeToAct  {
+                        objectName: "notify_swipe_button"
+                        width: buttonRow.width
+                        leftIconName: "call-end"
+                        rightIconName: "call-start"
+                        onRightTriggered: {
+                            notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
+                        }
+
+                        onLeftTriggered: {
+                            notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId))
+                        }
+                    }
+                }
+
                 Repeater {
                     id: actionRepeater
-
                     model: notification.actions
                     delegate: Loader {
                         id: loader
 
                         property string actionId: id
                         property string actionLabel: label
+                        active: !notifySwipeButtonLoader.active
 
                         Component {
                             id: actionButton
 
                             Button {
                                 objectName: "notify_button" + index
-                                width: buttonRow.width / 2 - spacing*2
+                                width: buttonRow.width / 2 - spacing * 2
                                 text: loader.actionLabel
                                 color: {
                                     var result = sdDarkGrey;

=== added file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	1970-01-01 00:00:00 +0000
+++ qml/Notifications/SwipeToAct.qml	2014-11-05 14:37:57 +0000
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import QtGraphicalEffects 1.0
+
+Item {
+    id: swipeToAct
+
+    width: parent.width
+    height: childrenRect.height
+
+    signal leftTriggered()
+    signal rightTriggered()
+
+    property string leftIconName
+    property string rightIconName
+    readonly property double sliderHeight: units.gu(6)
+    readonly property double gap: units.gu(1)
+    readonly property double halfWay: mouseArea.drag.maximumX / 2
+
+    Rectangle {
+        id: gradient
+        width: parent.width * 5
+        height: sliderHeight
+        visible: false
+        LinearGradient {
+            anchors.fill: parent
+            start: Qt.point(parent.x, parent.y)
+            end: Qt.point(parent.width, parent.y)
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: UbuntuColors.red }
+                GradientStop { position: 0.2; color: UbuntuColors.red }
+                GradientStop { position: 0.4; color: "#dddddd" }
+                GradientStop { position: 0.6; color: "#dddddd" }
+                GradientStop { position: 0.8; color: UbuntuColors.green }
+                GradientStop { position: 1.0; color: UbuntuColors.green }
+            }
+        }
+    }
+
+    ShaderEffectSource {
+        id: effectSourceGradient
+        sourceItem: gradient
+        width: gradient.width
+        height: gradient.height
+        sourceRect: Qt.rect(0.4 * gradient.width * (slider.x / halfWay), 0, mask.width, mask.height)
+        visible: false
+        hideSource: true
+    }
+
+    UbuntuShape {
+        id: mask
+        color: "black"
+        width: parent.width
+        height: sliderHeight
+        borderSource: "none"
+        visible: false
+    }
+
+    ShaderEffectSource {
+        id: effectSourceMask
+        sourceItem: mask
+        width: mask.width
+        height: mask.height
+        visible: false
+        hideSource: true
+    }
+
+    ShaderEffect {
+        width: parent.width
+        height: sliderHeight
+        property variant mask: effectSourceMask
+        property variant gradient: effectSourceGradient
+        vertexShader: "
+            uniform highp mat4 qt_Matrix;
+            attribute highp vec4 qt_Vertex;
+            attribute highp vec2 qt_MultiTexCoord0;
+            varying highp vec2 coord;
+            void main() {
+                coord = qt_MultiTexCoord0;
+                gl_Position = qt_Matrix * qt_Vertex;
+            }"
+        fragmentShader: "
+            varying highp vec2 coord;
+            uniform sampler2D mask;
+            uniform sampler2D gradient;
+            void main() {
+                lowp vec4 texMask = texture2D(mask, coord);
+                lowp vec4 texGradient = texture2D(gradient, coord);
+                gl_FragColor = texGradient.rgba * texMask.a ;
+            }"
+
+        Row {
+            id: row
+            anchors.fill: parent
+            spacing: gap
+            anchors.margins: gap
+
+            UbuntuShape {
+                id: leftShape
+                states: [
+                    State {
+                        name: "normal"
+                        PropertyChanges {
+                            target: leftShape
+                            color: UbuntuColors.red
+                        }
+                        PropertyChanges {
+                            target: innerLeftShape
+                            color: UbuntuColors.red
+                            visible: false
+                        }
+                    },
+                    State {
+                        name: "selected"
+                        PropertyChanges {
+                            target: leftShape
+                            color: "white"
+                        }
+                        PropertyChanges {
+                            target: innerLeftShape
+                            color: UbuntuColors.red
+                            visible: true
+                        }
+                    }
+                ]
+                state: "normal"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                opacity: slider.x <= halfWay ? 1.0 : 1.0 - ((slider.x - halfWay) / halfWay)
+                UbuntuShape {
+                    id: innerLeftShape
+                    anchors.centerIn: parent
+                    borderSource: "none"
+                    width: parent.width - units.gu(.5)
+                    height: parent.height - units.gu(.5)
+                }
+                Icon {
+                    anchors.centerIn: parent
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    name: leftIconName
+                    color: "white"
+                }
+            }
+
+            Rectangle {
+                id: leftSpacer
+                width: (row.width - (leftShape.width + slider.width + rightShape.width + 4 * row.spacing)) / 2
+                height: units.gu(4)
+                opacity: 0
+            }
+
+            UbuntuShape {
+                id: slider
+                objectName: "slider"
+
+                Behavior on x {
+                    UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                        easing.type: Easing.OutBounce
+                    }
+                }
+
+                Behavior on opacity {
+                    UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+
+                onOpacityChanged: {
+                    if (opacity === 0) {
+                        if (rightShape.state === "selected") {
+                            rightTriggered()
+                        }
+                        if (leftShape.state === "selected") {
+                            leftTriggered()
+                        }
+                    }
+                }
+
+                z: 1
+                color: "white"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                Row {
+                    anchors.fill: parent
+                    spacing: 2 * gap
+                    anchors.leftMargin: units.gu(.5)
+                    anchors.rightMargin: units.gu(.5)
+                    Icon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "back"
+                        width: units.gu(2)
+                        height: units.gu(2)
+                    }
+                    Icon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "next"
+                        width: units.gu(2)
+                        height: units.gu(2)
+                    }
+                }
+            }
+
+            Rectangle {
+                id: rightSpacer
+                width: leftSpacer.width
+                height: units.gu(4)
+                opacity: 0
+            }
+
+            UbuntuShape {
+                id: rightShape
+                states: [
+                    State {
+                        name: "normal"
+                        PropertyChanges {
+                            target: rightShape
+                            color: UbuntuColors.green
+                        }
+                        PropertyChanges {
+                            target: innerRightShape
+                            color: UbuntuColors.green
+                            visible: false
+                        }
+                    },
+                    State {
+                        name: "selected"
+                        PropertyChanges {
+                            target: rightShape
+                            color: "white"
+                        }
+                        PropertyChanges {
+                            target: innerRightShape
+                            color: UbuntuColors.green
+                            visible: true
+                        }
+                    }
+                ]
+                state: "normal"
+                height: units.gu(4)
+                width: units.gu(7)
+                borderSource: "none"
+                opacity: slider.x >= halfWay ? 1.0 : slider.x / halfWay
+                UbuntuShape {
+                    id: innerRightShape
+                    anchors.centerIn: parent
+                    borderSource: "none"
+                    width: parent.width - units.gu(.5)
+                    height: parent.height - units.gu(.5)
+                }
+                Icon {
+                    anchors.centerIn: parent
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    name: rightIconName
+                    color: "white"
+                }
+            }
+        }
+
+        MouseArea {
+            id: mouseArea
+            objectName: "swipeMouseArea"
+
+            anchors.fill: row
+            drag.target: slider
+            drag.axis: Drag.XAxis
+            drag.minimumX: 0
+            drag.maximumX: row.width - slider.width
+
+            onReleased: {
+                if (slider.x !== drag.minimumX || slider.x !== drag.maximumX) {
+                    slider.x = halfWay
+                }
+                if (slider.x === drag.minimumX) {
+                    slider.x = drag.minimumX
+                    slider.opacity = 0
+                    enabled = false
+                    leftShape.state = "selected"
+                }
+                if (slider.x === drag.maximumX) {
+                    slider.x = drag.maximumX
+                    slider.opacity = 0
+                    enabled = false
+                    rightShape.state = "selected"
+                }
+            }
+        }
+    }
+}

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2014-10-23 11:59:22 +0000
+++ qml/Panel/IndicatorPage.qml	2014-11-05 14:37:57 +0000
@@ -25,6 +25,7 @@
     //const
     property string title: rootActionState.title
     property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem
+    readonly property alias factory: _factory
 
     Indicators.UnityMenuModelStack {
         id: menuStack
@@ -117,6 +118,16 @@
             }
         }
 
+        Connections {
+            target: mainMenu.model ? mainMenu.model : null
+            onRowsAboutToBeRemoved: {
+                // track current item deletion.
+                if (mainMenu.selectedIndex >= first && mainMenu.selectedIndex <= last) {
+                    mainMenu.selectedIndex = -1;
+                }
+            }
+        }
+
         delegate: Loader {
             id: loader
             objectName: "menuItem" + index
@@ -164,7 +175,7 @@
     }
 
     MenuItemFactory {
-        id: factory
+        id: _factory
         rootModel: main.menuModel ? main.menuModel : null
         menuModel: mainMenu.model ? mainMenu.model : null
     }

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2014-10-06 16:22:57 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2014-11-05 14:37:57 +0000
@@ -290,12 +290,26 @@
             checked: serverChecked
             highlightWhenPressed: false
 
-            onServerCheckedChanged: {
-                // value can be changed by menu, so a binding won't work.
-                checked = serverChecked;
-            }
+            onServerCheckedChanged: updateFromServer()
             onTriggered: {
                 menuModel.activate(menuIndex);
+                resyncTimer.restart();
+            }
+
+            // value can be changed by menu, so a binding won't work.
+            function updateFromServer() {
+                resyncTimer.stop();
+                if (checked != serverChecked) {
+                    checked = serverChecked;
+                }
+            }
+
+            // Server value is not guaranteed to change to what we expect from an activation.
+            // In this case, we need to re-assert that we are presenting the UI with the set backend value.
+            Timer {
+                id: resyncTimer
+                interval: 1500
+                onTriggered: updateFromServer()
             }
         }
     }
@@ -315,12 +329,26 @@
             checked: serverChecked
             highlightWhenPressed: false
 
-            onServerCheckedChanged: {
-                // value can be changed by menu, so a binding won't work.
-                checked = serverChecked;
-            }
+            onServerCheckedChanged: updateFromServer()
             onTriggered: {
                 menuModel.activate(menuIndex);
+                resyncTimer.restart();
+            }
+
+            // value can be changed by menu, so a binding won't work.
+            function updateFromServer() {
+                resyncTimer.stop();
+                if (checked != serverChecked) {
+                    checked = serverChecked;
+                }
+            }
+
+            // Server value is not guaranteed to change to what we expect from an activation.
+            // In this case, we need to re-assert that we are presenting the UI with the set backend value.
+            Timer {
+                id: resyncTimer
+                interval: 1500
+                onTriggered: updateFromServer()
             }
         }
     }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-30 21:43:18 +0000
+++ qml/Shell.qml	2014-11-05 14:37:57 +0000
@@ -133,23 +133,32 @@
         objectName: "dashCommunicator"
     }
 
+    ScreenGrabber {
+        id: screenGrabber
+        z: edgeDemo.z + 10
+        enabled: Powerd.status === Powerd.On
+    }
+
     Binding {
         target: ApplicationManager
         property: "forceDashActive"
         value: launcher.shown || launcher.dashSwipe
     }
 
+    VolumeKeyFilter {
+        id: volumeKeyFilter
+        onVolumeDownPressed: volumeControl.volumeDown()
+        onVolumeUpPressed: volumeControl.volumeUp()
+        onBothVolumeKeysPressed: screenGrabber.capture()
+    }
 
     WindowKeysFilter {
-        // Handle but do not filter out volume keys
-        Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }
-        Keys.onVolumeDownPressed: { volumeControl.volumeDown(); event.accepted = false; }
-
         Keys.onPressed: {
             if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
                 dialogs.onPowerKeyPressed();
                 event.accepted = true;
             } else {
+                volumeKeyFilter.onKeyPressed(event.key);
                 event.accepted = false;
             }
         }
@@ -159,6 +168,7 @@
                 dialogs.onPowerKeyReleased();
                 event.accepted = true;
             } else {
+                volumeKeyFilter.onKeyReleased(event.key);
                 event.accepted = false;
             }
         }
@@ -175,7 +185,7 @@
             target: ApplicationManager
             onFocusRequested: {
                 if (greeter.narrowMode) {
-                    if (appId === "dialer-app" && callManager.hasCalls) {
+                    if (appId === "dialer-app" && callManager.hasCalls && shell.locked) {
                         // If we are in the middle of a call, make dialer lockedApp and show it.
                         // This can happen if user backs out of dialer back to greeter, then
                         // launches dialer again.

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-10-30 21:43:06 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-11-05 14:37:57 +0000
@@ -157,57 +157,6 @@
 
         self.assert_notification_action_id_was_called('action_id')
 
-    def test_sd_incoming_call(self):
-        """Rejecting a call should make notification expand and
-            offer more options."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
-
-        summary = "Incoming call"
-        body = "Frank Zappa\n+44 (0)7736 027340"
-        icon_path = self._get_icon_path('avatars/anna_olsson.png')
-        hints = [
-            ("x-canonical-secondary-icon", "incoming-call"),
-            ("x-canonical-snap-decisions", "true"),
-            ("x-canonical-private-affirmative-tint", "true"),
-            ("x-canonical-private-rejection-tint", "true"),
-        ]
-
-        actions = [
-            ('action_accept', 'Hold + Answer'),
-            ('action_decline_1', 'End + Answer'),
-            ('action_decline_2', 'Decline'),
-            ('action_decline_3', 'message:I missed your call - can you call me now?'),
-            ('action_decline_4', 'message:I\'m running late. I\'m on my way.'),
-            ('action_decline_5', 'message:I\'m busy at the moment. I\'ll call later.'),
-            ('action_decline_6', 'edit:Custom'),
-        ]
-
-        self._create_interactive_notification(
-            summary,
-            body,
-            icon_path,
-            "NORMAL",
-            actions,
-            hints
-        )
-
-        notify_list = self._get_notifications_list()
-        get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
-        notification = get_notification()
-        self._assert_notification(notification, summary, body, True, True, 1.0)
-        notification.pointing_device.click_object(
-            notification.select_single(objectName="combobutton_dropdown"))
-        self.assertThat(
-            notification.select_single(objectName="notify_button2").expanded,
-            Eventually(Equals(True)))
-        time.sleep(2)
-        notification.pointing_device.click_object(
-            notification.select_single(objectName="notify_button4"))
-        self.assert_notification_action_id_was_called("action_decline_4")
-
-
     def test_sd_one_over_two_layout(self):
         """Snap-decision with three actions should use one-over two button layout."""
         unity_proxy = self.launch_unity()

=== modified file 'tests/mocks/QtMultimedia/QtMultimedia.qmltypes'
--- tests/mocks/QtMultimedia/QtMultimedia.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/mocks/QtMultimedia/QtMultimedia.qmltypes	2014-11-05 14:37:57 +0000
@@ -20,11 +20,21 @@
                 "StoppedState": 2
             }
         }
+        Enum {
+            name: "AudioRole"
+            values: {
+                "AlarmRole": 0,
+                "AlertRole": 1,
+                "MultimediaRole": 2,
+                "PhoneRole": 3
+            }
+        }
         Property { name: "source"; type: "QUrl" }
         Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
         Property { name: "position"; type: "int"; isReadonly: true }
         Property { name: "duration"; type: "int"; isReadonly: true }
         Property { name: "errorString"; type: "string"; isReadonly: true }
+        Property { name: "audioRole"; type: "AudioRole" }
         Signal {
             name: "sourceChanged"
             Parameter { name: "source"; type: "QUrl" }

=== modified file 'tests/mocks/QtMultimedia/audio.cpp'
--- tests/mocks/QtMultimedia/audio.cpp	2014-09-12 14:51:55 +0000
+++ tests/mocks/QtMultimedia/audio.cpp	2014-11-05 14:37:57 +0000
@@ -105,3 +105,13 @@
         stop();
     }
 }
+
+Audio::AudioRole Audio::audioRole() const
+{
+    return Audio::MultimediaRole;
+}
+
+void Audio::setAudioRole(Audio::AudioRole audioRole)
+{
+    Q_UNUSED(audioRole);
+}

=== modified file 'tests/mocks/QtMultimedia/audio.h'
--- tests/mocks/QtMultimedia/audio.h	2013-11-14 12:12:05 +0000
+++ tests/mocks/QtMultimedia/audio.h	2014-11-05 14:37:57 +0000
@@ -27,11 +27,13 @@
 {
     Q_OBJECT
     Q_ENUMS(PlaybackState)
+    Q_ENUMS(AudioRole)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
     Q_PROPERTY(int position READ position NOTIFY positionChanged)
     Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)
+    Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole)
 public:
     enum PlaybackState {
         PlayingState,
@@ -39,6 +41,13 @@
         StoppedState
     };
 
+    enum AudioRole {
+        AlarmRole,
+        AlertRole,
+        MultimediaRole,
+        PhoneRole
+    };
+
     explicit Audio(QObject *parent = 0);
 
     QUrl source() const;
@@ -52,6 +61,9 @@
 
     QString errorString() const;
 
+    AudioRole audioRole() const;
+    void setAudioRole(AudioRole audioRole);
+
 public Q_SLOTS:
     void pause();
     void play();

=== modified file 'tests/mocks/Unity/Notifications/CMakeLists.txt'
--- tests/mocks/Unity/Notifications/CMakeLists.txt	2014-05-02 23:27:02 +0000
+++ tests/mocks/Unity/Notifications/CMakeLists.txt	2014-11-05 14:37:57 +0000
@@ -1,1 +1,15 @@
-add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(MockNotificationsPlugin_SOURCES
+    plugin.cpp
+    MockNotificationTypes.cpp
+    MockActionModel.cpp
+)
+
+add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES})
+
+qt5_use_modules(MockNotificationsPlugin Core Quick)
+
+add_unity8_mock(Unity.Notifications 1.0 Unity/Notifications TARGETS MockNotificationsPlugin)

=== added file 'tests/mocks/Unity/Notifications/MockActionModel.cpp'
--- tests/mocks/Unity/Notifications/MockActionModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.cpp	2014-11-05 14:37:57 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "MockActionModel.h"
+
+struct ActionModelPrivate {
+    QList<QString> labels;
+    QList<QString> ids;
+};
+
+ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) {
+    insertAction("ok_id", "Ok");
+    insertAction("cancel_id", "Cancel");
+}
+
+ActionModel::~ActionModel() {
+}
+
+int ActionModel::rowCount(const QModelIndex &index) const {
+    return p->labels.size();
+}
+
+QVariant ActionModel::data(const QModelIndex &index, int role) const {
+    if (!index.isValid())
+            return QVariant();
+
+    switch(role) {
+        case RoleActionLabel:
+            return QVariant(p->labels[index.row()]);
+
+        case RoleActionId:
+            return QVariant(p->ids[index.row()]);
+
+        default:
+            return QVariant();
+    }
+}
+
+QHash<int, QByteArray> ActionModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+
+    roles.insert(RoleActionLabel, "label");
+    roles.insert(RoleActionId, "id");
+
+    return roles;
+}
+
+Q_INVOKABLE QVariant ActionModel::data(int row, int role) const
+{
+    return data(index(row, 0), role);
+}
+
+void ActionModel::insertAction(const QString &id, const QString &label) {
+    p->ids.push_back(id);
+    p->labels.push_back(label);
+}

=== added file 'tests/mocks/Unity/Notifications/MockActionModel.h'
--- tests/mocks/Unity/Notifications/MockActionModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2014-11-05 14:37:57 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#ifndef MOCK_ACTION_MODEL_H
+#define MOCK_ACTION_MODEL_H
+
+#include <QStringListModel>
+
+struct ActionModelPrivate;
+
+class ActionModel : public QStringListModel {
+    Q_OBJECT
+
+public:
+    ActionModel(QObject *parent=nullptr);
+    virtual ~ActionModel();
+
+    virtual int rowCount(const QModelIndex &index) const;
+    virtual QVariant data(const QModelIndex &index, int role) const;
+    virtual QHash<int, QByteArray> roleNames() const;
+
+    Q_ENUMS(ActionsRoles)
+    enum ActionsRoles {
+        RoleActionLabel = Qt::UserRole + 1,
+        RoleActionId    = Qt::UserRole + 2
+    };
+    Q_INVOKABLE QVariant data(int row, int role) const;
+
+    void insertAction(const QString &id, const QString &label);
+
+private:
+    QScopedPointer<ActionModelPrivate> p;
+};
+
+#endif // MOCK_ACTION_MODEL_H

=== added file 'tests/mocks/Unity/Notifications/MockNotificationTypes.cpp'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationTypes.cpp	2014-11-05 14:37:57 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "MockNotificationTypes.h"
+
+MockNotification::MockNotification(QObject *parent) : QObject(parent) {
+}
+
+MockNotification::~MockNotification() {
+}

=== added file 'tests/mocks/Unity/Notifications/MockNotificationTypes.h'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationTypes.h	2014-11-05 14:37:57 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#ifndef MOCK_NOTIFICATION_TYPES_H
+#define MOCK_NOTIFICATION_TYPES_H
+
+#include <QObject>
+
+class MockNotification : public QObject {
+    Q_OBJECT
+    Q_ENUMS(Type)
+
+public:
+    MockNotification(QObject *parent=nullptr);
+    virtual ~MockNotification();
+
+    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
+};
+
+#endif // MOCK_NOTIFICATION_TYPES_H

=== removed file 'tests/mocks/Unity/Notifications/notification.js'
--- tests/mocks/Unity/Notifications/notification.js	2013-06-19 10:24:31 +0000
+++ tests/mocks/Unity/Notifications/notification.js	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*
- * 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/>.
- */
-
-.pragma library
-
-var Confirmation = 0;
-var Ephemeral = 1;
-var Interactive = 2;
-var SnapDecision = 3;
-var PlaceHolder = 4;

=== added file 'tests/mocks/Unity/Notifications/plugin.cpp'
--- tests/mocks/Unity/Notifications/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/plugin.cpp	2014-11-05 14:37:57 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+#include "plugin.h"
+#include "MockActionModel.h"
+#include "MockNotificationTypes.h"
+
+#include <QtQml/qqml.h>
+
+void TestNotificationPlugin::registerTypes(const char* uri)
+{
+    // @uri Unity.Notifications
+    qmlRegisterUncreatableType<MockNotification>(uri, 1, 0, "Notification", "Notification objects can only be created by the plugin");
+    qmlRegisterType<ActionModel>(uri, 1, 0, "ActionModel");
+}

=== added file 'tests/mocks/Unity/Notifications/plugin.h'
--- tests/mocks/Unity/Notifications/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/plugin.h	2014-11-05 14:37:57 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Mirco Mueller <[e-mail]>
+ */
+
+
+#ifndef TESTNOTIFICATION_PLUGIN_H
+#define TESTNOTIFICATION_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class TestNotificationPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char* uri);
+};
+
+#endif // TESTNOTIFICATION_PLUGIN_H

=== modified file 'tests/mocks/Unity/Notifications/qmldir'
--- tests/mocks/Unity/Notifications/qmldir	2014-05-02 22:57:21 +0000
+++ tests/mocks/Unity/Notifications/qmldir	2014-11-05 14:37:57 +0000
@@ -1,3 +1,4 @@
 module Unity.Notifications
-Notification 1.0 notification.js
+plugin MockNotificationsPlugin
 typeinfo Notifications.qmltypes
+

=== modified file 'tests/plugins/Ubuntu/Gestures/GestureTest.cpp'
--- tests/plugins/Ubuntu/Gestures/GestureTest.cpp	2014-10-17 11:01:53 +0000
+++ tests/plugins/Ubuntu/Gestures/GestureTest.cpp	2014-11-05 14:37:57 +0000
@@ -90,6 +90,7 @@
     mousePressEventHandler = defaultMouseEventHandler;
     mouseMoveEventHandler = defaultMouseEventHandler;
     mouseReleaseEventHandler = defaultMouseEventHandler;
+    mouseDoubleClickEventHandler = defaultMouseEventHandler;
 }
 
 void DummyItem::touchEvent(QTouchEvent *event)
@@ -113,6 +114,11 @@
     mouseReleaseEventHandler(event);
 }
 
+void DummyItem::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    mouseDoubleClickEventHandler(event);
+}
+
 void DummyItem::defaultTouchEventHandler(QTouchEvent *event)
 {
     event->accept();

=== modified file 'tests/plugins/Ubuntu/Gestures/GestureTest.h'
--- tests/plugins/Ubuntu/Gestures/GestureTest.h	2014-10-17 11:01:53 +0000
+++ tests/plugins/Ubuntu/Gestures/GestureTest.h	2014-11-05 14:37:57 +0000
@@ -52,12 +52,14 @@
     std::function<void(QMouseEvent*)> mousePressEventHandler;
     std::function<void(QMouseEvent*)> mouseMoveEventHandler;
     std::function<void(QMouseEvent*)> mouseReleaseEventHandler;
+    std::function<void(QMouseEvent*)> mouseDoubleClickEventHandler;
 protected:
     void touchEvent(QTouchEvent *event) override;
 
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
 private:
     static void defaultTouchEventHandler(QTouchEvent *event);
     static void defaultMouseEventHandler(QMouseEvent *event);

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp	2014-10-17 11:01:53 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp	2014-11-05 14:37:57 +0000
@@ -16,6 +16,7 @@
 
 #include <QtTest>
 #include <QQuickView>
+#include <QStyleHints>
 
 #include "GestureTest.h"
 
@@ -29,6 +30,8 @@
 private Q_SLOTS:
     void sendMouseEventIfTouchIgnored_data();
     void sendMouseEventIfTouchIgnored();
+    void mouseDoubleClick_data();
+    void mouseDoubleClick();
 };
 
 tst_TouchDispatcher::tst_TouchDispatcher()
@@ -85,6 +88,62 @@
     QCOMPARE(gotMousePressEvent, shouldGetMousePress);
 }
 
+void tst_TouchDispatcher::mouseDoubleClick_data()
+{
+    QTest::addColumn<ulong>("timeBetweenClicks");
+    QTest::addColumn<bool>("shouldSendDoubleClick");
+
+    QTest::newRow("double click") << static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval() / 10) << true;
+    QTest::newRow("two separate clicks") << static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval() * 2) << false;
+}
+
+void tst_TouchDispatcher::mouseDoubleClick()
+{
+    QFETCH(ulong, timeBetweenClicks);
+    QFETCH(bool, shouldSendDoubleClick);
+    DummyItem *dummyItem = new DummyItem(m_view->rootObject());
+    dummyItem->setAcceptedMouseButtons(Qt::LeftButton);
+
+    TouchDispatcher touchDispatcher;
+    touchDispatcher.setTargetItem(dummyItem);
+
+    bool gotDoubleClickEvent = false;
+    dummyItem->mouseDoubleClickEventHandler = [&](QMouseEvent *event) {
+        gotDoubleClickEvent = true;
+        event->accept();
+    };
+
+    dummyItem->touchEventHandler = [&](QTouchEvent *event) {
+        event->ignore();
+    };
+
+    ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval());
+
+    QList<QTouchEvent::TouchPoint> touchPoints;
+    {
+        QTouchEvent::TouchPoint touchPoint;
+        touchPoint.setId(0);
+        touchPoint.setState(Qt::TouchPointPressed);
+        touchPoints.append(touchPoint);
+    }
+    ulong timestamp = 12345;
+
+    touchDispatcher.dispatch(QEvent::TouchBegin, m_device, Qt::NoModifier, touchPoints, m_view, timestamp);
+
+    touchPoints[0].setState(Qt::TouchPointReleased);
+    timestamp += doubleClickInterval / 10;
+
+    touchDispatcher.dispatch(QEvent::TouchEnd, m_device, Qt::NoModifier, touchPoints, m_view, timestamp);
+
+    touchPoints[0].setId(1);
+    touchPoints[0].setState(Qt::TouchPointPressed);
+    timestamp += timeBetweenClicks;
+
+    touchDispatcher.dispatch(QEvent::TouchBegin, m_device, Qt::NoModifier, touchPoints, m_view, timestamp);
+
+    QCOMPARE(gotDoubleClickEvent, shouldSendDoubleClick);
+}
+
 QTEST_MAIN(tst_TouchDispatcher)
 
 #include "tst_TouchDispatcher.moc"

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-10-30 21:40:34 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-11-05 14:37:57 +0000
@@ -365,8 +365,8 @@
         QCOMPARE(map.value("countVisible").toBool(), false);
 
         // Now make it visible and set it to 55 through D-Bus
-        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", 55);
-        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", true);
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", QVariant::fromValue(QDBusVariant(55)));
+        interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", QVariant::fromValue(QDBusVariant(true)));
 
         // Fetch it again using GetAll
         reply = interface.call("GetAll");

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-10-13 09:23:34 +0000
+++ tests/qmltests/CMakeLists.txt	2014-11-05 14:37:57 +0000
@@ -70,6 +70,7 @@
 add_qml_test(Launcher Launcher)
 add_qml_test(Notifications Notifications)
 add_qml_test(Notifications VisualSnapDecisionsQueue)
+add_qml_test(Notifications SwipeToAct)
 add_qml_test(Panel ActiveCallHint)
 add_qml_test(Panel IndicatorItem)
 add_qml_test(Panel IndicatorItemRow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

=== modified file 'tests/qmltests/Greeter/tst_SingleGreeter.qml'
--- tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-10-01 13:20:32 +0000
+++ tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-11-05 14:37:57 +0000
@@ -27,50 +27,72 @@
     width: units.gu(60)
     height: units.gu(80)
 
-    Greeter {
-        id: greeter
-        width: parent.width
-        height: parent.height
-        x: 0; y: 0
-
-        property int minX: 0
-
-        onXChanged: {
-            if (x < minX) {
-                minX = x;
-            }
-        }
-    }
-
-    Component {
-        id: greeterComponent
-        Greeter {
-            SignalSpy {
-                objectName: "selectedSpy"
-                target: parent
-                signalName: "selected"
+    Loader {
+        id: greeterLoader
+        anchors.fill: parent
+
+        property bool itemDestroyed: false
+
+        sourceComponent: Component {
+            Greeter {
+                anchors.fill: greeterLoader
+
+                property int minX: 0
+
+                onXChanged: {
+                    if (x < minX) {
+                        minX = x;
+                    }
+                }
+
+                Component.onDestruction: {
+                    greeterLoader.itemDestroyed = true;
+                }
+                SignalSpy {
+                    objectName: "selectedSpy"
+                    target: parent
+                    signalName: "selected"
+                }
             }
         }
     }
 
     SignalSpy {
         id: unlockSpy
-        target: greeter
+        target: greeterLoader.item
         signalName: "unlocked"
     }
 
     SignalSpy {
         id: teaseSpy
-        target: greeter
+        target: greeterLoader.item
         signalName: "tease"
     }
 
+    SignalSpy {
+        id: infographicDataChangedSpy
+        target: LightDM.Infographic
+        signalName: "dataChanged"
+    }
+
     UT.UnityTestCase {
         name: "SingleGreeter"
         when: windowShown
 
+        property Greeter greeter: greeterLoader.item
+
         function cleanup() {
             AccountsService.statsWelcomeScreen = true
+
+            // force a reload so that we get a fresh Greeter for the next test
+            greeterLoader.itemDestroyed = false;
+            greeterLoader.active = false;
+            tryCompare(greeterLoader, "itemDestroyed", true);
+
+            unlockSpy.clear();
+            teaseSpy.clear();
+
+            greeterLoader.active = true;
         }
 
         function test_properties() {
@@ -103,11 +125,32 @@
         }
 
         function test_initial_selected_signal() {
-            var greeterObj = greeterComponent.createObject(this)
-            var spy = findChild(greeterObj, "selectedSpy")
-            spy.wait()
-            tryCompare(spy, "count", 1)
-            greeterObj.destroy()
+            var selectedSpy = findChild(greeter, "selectedSpy");
+            selectedSpy.wait();
+            tryCompare(selectedSpy, "count", 1);
+        }
+
+        /*
+            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1388359
+            "User metrics can no longer be changed by double tap"
+        */
+        function test_doubleTapSwitchesToNextInfographic() {
+            infographicDataChangedSpy.clear();
+
+            var infographicPrivate = findInvisibleChild(greeter, "infographicPrivate");
+            verify(infographicPrivate);
+
+            // wait for the UI to settle down before double tapping it
+            tryCompare(infographicPrivate, "animating", false);
+
+            var dataCircle = findChild(greeter, "dataCircle");
+            verify(dataCircle);
+
+            tap(dataCircle);
+            wait(1);
+            tap(dataCircle);
+
+            tryCompare(infographicDataChangedSpy, "count", 1);
         }
     }
 }

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-10-14 10:07:44 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2014-11-05 14:37:57 +0000
@@ -23,280 +23,51 @@
 import Unity.Notifications 1.0
 import QtMultimedia 5.0
 
-Row {
-    id: rootRow
-
-    Component {
-        id: mockNotification
-
-        QtObject {
-            function invokeAction(actionId) {
-                mockModel.actionInvoked(actionId)
-            }
-        }
-    }
-
-    ListModel {
-        id: mockModel
-
-        signal actionInvoked(string actionId)
-
-        function getRaw(id) {
-            return mockNotification.createObject(mockModel)
-        }
-
-        // add the default/PlaceHolder notification to the model
-        Component.onCompleted: {
+Item {
+    width: notificationsRect.width + interactiveControls.width
+    height: notificationsRect.height
+
+    Row {
+        id: rootRow
+
+        Component {
+            id: mockNotification
+
+            QtObject {
+                function invokeAction(actionId) {
+                    mockModel.actionInvoked(actionId)
+                }
+            }
+        }
+
+        ListModel {
+            id: mockModel
+            dynamicRoles: true
+
+            signal actionInvoked(string actionId)
+
+            function getRaw(id) {
+                return mockNotification.createObject(mockModel)
+            }
+
+            // add the default/PlaceHolder notification to the model
+            Component.onCompleted: {
+                var n = {
+                    type: Notification.PlaceHolder,
+                    hints: {},
+                    summary: "",
+                    body: "",
+                    icon: "",
+                    secondaryIcon: "",
+                    actions: []
+                }
+
+                append(n)
+            }
+        }
+
+        function addSnapDecisionNotification() {
             var n = {
-                type: Notification.PlaceHolder,
-                hints: {},
-                summary: "",
-                body: "",
-                icon: "",
-                value: 0,
-                secondaryIcon: "",
-                actions: []
-            }
-
-            append(n)
-        }
-    }
-
-    function addSnapDecisionNotification() {
-        var n = {
-            type: Notification.SnapDecision,
-            hints: {"x-canonical-private-affirmative-tint": "true"},
-            summary: "Tom Ato",
-            body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
-            icon: "../graphics/avatars/funky.png",
-            secondaryIcon: "../graphics/applicationIcons/facebook.png",
-            actions: [{ id: "ok_id", label: "Ok"},
-                      { id: "cancel_id", label: "Cancel"},
-                      { id: "notreally_id", label: "Not really"},
-                      { id: "noway_id", label: "messages:No way"},
-                      { id: "nada_id", label: "messages:Nada"}]
-        }
-
-        mockModel.append(n)
-    }
-
-    function add2over1SnapDecisionNotification() {
-        var n = {
-            type: Notification.SnapDecision,
-            hints: {"x-canonical-private-affirmative-tint": "true",},
-            summary: "Theatre at Ferria Stadium",
-            body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
-            icon: "",
-            secondaryIcon: "",
-            actions: [{ id: "ok_id", label: "Ok"},
-                      { id: "snooze_id", label: "Snooze"},
-                      { id: "view_id", label: "View"}]
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            summary: "Cole Raby",
-            body: "I did not expect it to be that late.",
-            icon: "../graphics/avatars/amanda.png",
-            secondaryIcon: "../graphics/applicationIcons/facebook.png",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralNonShapedIconNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            hints: {"x-canonical-non-shaped-icon": "true"},
-            summary: "Contacts",
-            body: "Synchronised contacts-database with cloud-storage.",
-            icon: "../graphics/applicationIcons/contacts-app.png",
-            secondaryIcon: "",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addEphemeralIconSummaryNotification() {
-        var n = {
-            type: Notification.Ephemeral,
-            hints: {"x-canonical-non-shaped-icon": "false"},
-            summary: "Photo upload completed",
-            body: "",
-            icon: "../graphics/applicationIcons/facebook.png",
-            secondaryIcon: "",
-            actions: []
-        }
-
-        mockModel.append(n)
-    }
-
-    function addInteractiveNotification() {
-        var n = {
-            type: Notification.Interactive,
-            summary: "Interactive notification",
-            body: "This is a notification that can be clicked",
-            icon: "../graphics/avatars/anna_olsson.png",
-            secondaryIcon: "",
-            actions: [{ id: "reply_id", label: "Dummy"}],
-        }
-
-        mockModel.append(n)
-    }
-
-    function addConfirmationNotification() {
-        var n = {
-            type: Notification.Confirmation,
-            hints: {"x-canonical-non-shaped-icon": "true"},
-            summary: "Confirmation notification",
-            body: "",
-            icon: "image://theme/audio-volume-medium",
-            secondaryIcon: "",
-            value: 50,
-            actions: [],
-        }
-
-        mockModel.append(n)
-    }
-
-    function add2ndConfirmationNotification() {
-        var n = {
-            type: Notification.Confirmation,
-            hints: {"x-canonical-non-shaped-icon": "true",
-                    "x-canonical-value-bar-tint": "true"},
-            summary: "Confirmation notification",
-            body: "High Volume",
-            icon: "image://theme/audio-volume-high",
-            secondaryIcon: "",
-            value: 85,
-            actions: [],
-        }
-
-        mockModel.append(n)
-    }
-
-    function clearNotifications() {
-        while(mockModel.count > 1) {
-            remove1stNotification()
-        }
-    }
-
-    function remove1stNotification() {
-        if (mockModel.count > 1)
-            mockModel.remove(1)
-    }
-
-    Rectangle {
-        id: notificationsRect
-
-        width: units.gu(40)
-        height: units.gu(115)
-
-        MouseArea{
-            id: clickThroughCatcher
-
-            anchors.fill: parent
-        }
-
-        Notifications {
-            id: notifications
-
-            margin: units.gu(1)
-
-            anchors.fill: parent
-            model: mockModel
-        }
-    }
-
-    Rectangle {
-        id: interactiveControls
-
-        width: units.gu(30)
-        height: units.gu(115)
-        color: "grey"
-
-        Column {
-            spacing: units.gu(1)
-            anchors.fill: parent
-            anchors.margins: units.gu(1)
-
-            Button {
-                width: parent.width
-                text: "add a snap-decision"
-                onClicked: addSnapDecisionNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a 2over1 snap-decision"
-                onClicked: add2over1SnapDecisionNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an ephemeral"
-                onClicked: addEphemeralNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an non-shaped-icon-summary-body"
-                onClicked: addEphemeralNonShapedIconNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an icon-summary"
-                onClicked: addEphemeralIconSummaryNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add an interactive"
-                onClicked: addInteractiveNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a confirmation"
-                onClicked: addConfirmationNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "add a 2nd confirmation"
-                onClicked: add2ndConfirmationNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "remove 1st notification"
-                onClicked: remove1stNotification()
-            }
-
-            Button {
-                width: parent.width
-                text: "clear model"
-                onClicked: clearNotifications()
-            }
-        }
-    }
-
-    UnityTestCase {
-        id: root
-        name: "NotificationRendererTest"
-        when: windowShown
-
-        function test_NotificationRenderer_data() {
-            return [
-            {
-                tag: "Snap Decision with secondary icon and button-tint",
                 type: Notification.SnapDecision,
                 hints: {"x-canonical-private-affirmative-tint": "true"},
                 summary: "Tom Ato",
@@ -307,23 +78,14 @@
                           { id: "cancel_id", label: "Cancel"},
                           { id: "notreally_id", label: "Not really"},
                           { id: "noway_id", label: "messages:No way"},
-                          { id: "nada_id", label: "messages:Nada"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                nonShaped: false,
-                secondaryIconVisible: true,
-                buttonRowVisible: true,
-                buttonTinted: true,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "2-over-1 Snap Decision with button-tint",
+                          { id: "nada_id", label: "messages:Nada"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function add2over1SnapDecisionNotification() {
+            var n = {
                 type: Notification.SnapDecision,
                 hints: {"x-canonical-private-affirmative-tint": "true"},
                 summary: "Theatre at Ferria Stadium",
@@ -332,327 +94,573 @@
                 secondaryIcon: "",
                 actions: [{ id: "ok_id", label: "Ok"},
                           { id: "snooze_id", label: "Snooze"},
-                          { id: "view_id", label: "View"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: false,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: true,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification - icon-summary layout",
-                type: Notification.Ephemeral,
-                hints: {},
+                          { id: "view_id", label: "View"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                summary: "Cole Raby",
+                body: "I did not expect it to be that late.",
+                icon: "../graphics/avatars/amanda.png",
+                secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralNonShapedIconNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                hints: {"x-canonical-non-shaped-icon": "true"},
+                summary: "Contacts",
+                body: "Synchronised contacts-database with cloud-storage.",
+                icon: "../graphics/applicationIcons/contacts-app.png",
+                secondaryIcon: "",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addEphemeralIconSummaryNotification() {
+            var n = {
+                type: Notification.Ephemeral,
+                hints: {"x-canonical-non-shaped-icon": "false"},
                 summary: "Photo upload completed",
                 body: "",
                 icon: "../graphics/applicationIcons/facebook.png",
                 secondaryIcon: "",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: false,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg",
-                        "suppress-sound": "true"},
-                summary: "New comment successfully published",
-                body: "",
-                icon: "",
-                secondaryIcon: "../graphics/applicationIcons/facebook.png",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: false,
-                interactiveAreaEnabled: false,
-                iconVisible: false,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: true,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Interactive notification",
+                actions: []
+            }
+
+            mockModel.append(n)
+        }
+
+        function addInteractiveNotification() {
+            var n = {
                 type: Notification.Interactive,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
                 summary: "Interactive notification",
                 body: "This is a notification that can be clicked",
-                icon: "../graphics/avatars/amanda.png",
+                icon: "../graphics/avatars/anna_olsson.png",
                 secondaryIcon: "",
                 actions: [{ id: "reply_id", label: "Dummy"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Snap Decision without secondary icon and no button-tint",
-                type: Notification.SnapDecision,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
-                summary: "Bro Coly",
-                body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
-                icon: "../graphics/avatars/anna_olsson.png",
-                secondaryIcon: "",
-                actions: [{ id: "accept_id", label: "Accept"},
-                          { id: "reject_id", label: "Reject"}],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: false,
-                buttonRowVisible: true,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "sound-file": "dummy.ogg"},
-                summary: "Cole Raby",
-                body: "I did not expect it to be that late.",
-                icon: "../graphics/avatars/funky.png",
-                secondaryIcon: "../graphics/applicationIcons/facebook.png",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: true,
-                secondaryIconVisible: true,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: true,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Ephemeral notification with non-shaped icon",
-                type: Notification.Ephemeral,
-                hints: {"x-canonical-private-affirmative-tint": "false",
-                        "x-canonical-non-shaped-icon": "true"},
-                summary: "Contacts",
-                body: "Synchronised contacts-database with cloud-storage.",
-                icon: "image://theme/contacts-app",
-                secondaryIcon: "",
-                actions: [],
-                summaryVisible: true,
-                bodyVisible: true,
-                iconVisible: true,
-                centeredIconVisible: false,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: false,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Confirmation notification with value",
+            }
+
+            mockModel.append(n)
+        }
+
+        function addConfirmationNotification() {
+            var n = {
                 type: Notification.Confirmation,
                 hints: {"x-canonical-non-shaped-icon": "true"},
-                summary: "",
+                summary: "Confirmation notification",
                 body: "",
                 icon: "image://theme/audio-volume-medium",
                 secondaryIcon: "",
                 value: 50,
                 actions: [],
-                summaryVisible: false,
-                bodyVisible: false,
-                iconVisible: false,
-                centeredIconVisible: true,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: true,
-                valueLabelVisible: false,
-                valueTinted: false
-            },
-            {
-                tag: "Confirmation notification with value, label and tint",
+            }
+
+            mockModel.append(n)
+        }
+
+        function add2ndConfirmationNotification() {
+            var n = {
                 type: Notification.Confirmation,
                 hints: {"x-canonical-non-shaped-icon": "true",
-                        "x-canonical-value-bar-tint" : "true"},
-                summary: "",
+                        "x-canonical-value-bar-tint": "true"},
+                summary: "Confirmation notification",
                 body: "High Volume",
                 icon: "image://theme/audio-volume-high",
                 secondaryIcon: "",
                 value: 85,
                 actions: [],
-                summaryVisible: false,
-                bodyVisible: false,
-                iconVisible: false,
-                centeredIconVisible: true,
-                shaped: false,
-                secondaryIconVisible: false,
-                buttonRowVisible: false,
-                buttonTinted: false,
-                hasSound: false,
-                valueVisible: true,
-                valueLabelVisible: true,
-                valueTinted: true
-            }
-            ]
-        }
-
-        SignalSpy {
-            id: clickThroughSpy
-
-            target: clickThroughCatcher
-            signalName: "clicked"
-        }
-
-        SignalSpy {
-            id: actionSpy
-
-            target: mockModel
-            signalName: "actionInvoked"
-        }
-
-        function cleanup() {
-            clickThroughSpy.clear()
-            actionSpy.clear()
-        }
-
-        function test_NotificationRenderer(data) {
-            // populate model with some mock notifications
-            mockModel.append(data)
-
-            // make sure the view is properly updated before going on
-            notifications.forceLayout();
-            waitForRendering(notifications);
-
-            var notification = findChild(notifications, "notification" + (mockModel.count - 1))
-            verify(notification !== undefined, "notification wasn't found");
-
-            waitForRendering(notification);
-
-            var icon = findChild(notification, "icon")
-            var centeredIcon = findChild(notification, "centeredIcon")
-            var interactiveArea = findChild(notification, "interactiveArea")
-            var secondaryIcon = findChild(notification, "secondaryIcon")
-            var summaryLabel = findChild(notification, "summaryLabel")
-            var bodyLabel = findChild(notification, "bodyLabel")
-            var buttonRow = findChild(notification, "buttonRow")
-            var valueIndicator = findChild(notification, "valueIndicator")
-            var valueLabel = findChild(notification, "valueLabel")
-            var innerBar = findChild(notification, "innerBar")
-
-            compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
-            if (icon.visible) {
-                compare(icon.shaped, data.shaped, "shaped-status is incorrect")
-            }
-            compare(centeredIcon.visible, data.centeredIconVisible, "centered-icon visibility is incorrect")
-            if (centeredIcon.visible) {
-                compare(centeredIcon.shaped, data.shaped, "shaped-status is incorrect")
-            }
-            compare(valueIndicator.visible, data.valueVisible, "value-indicator visibility is incorrect")
-            if (valueIndicator.visible) {
-                verify(innerBar.color === data.valueTinted ? UbuntuColors.orange : "white", "value-bar has the wrong color-tint")
-            }
-            compare(valueLabel.visible, data.valueLabelVisible, "value-label visibility is incorrect")
-
-            // test input does not fall through
-            mouseClick(notification, notification.width / 2, notification.height / 2)
-            if(data.type == Notification.Interactive) {
-                actionSpy.wait()
-                compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
-            }
-            compare(clickThroughSpy.count, 0, "click on notification fell through")
-
-            compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
-            compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
-            compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
-            compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
-
-            var audioItem = findInvisibleChild(notification, "sound")
-            compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
-
-            if(data.buttonRowVisible) {
-                var buttonCancel = findChild(buttonRow, "notify_button1")
-                var buttonAccept = findChild(buttonRow, "notify_button0")
-
-                // only test the left/cancel-button if two actions have been passed in
-                if (data.actions.length == 2) {
-                    tryCompareFunction(function() { mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
-                    actionSpy.clear()
-                }
-
-                // check the tinting of the positive/right button
-                verify(buttonAccept.color === data.buttonTinted ? "#3fb24f" : "#dddddd", "button has the wrong color-tint")
-
-                // click the positive/right button
-                tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
+            }
+
+            mockModel.append(n)
+        }
+
+        function clearNotifications() {
+            while(mockModel.count > 1) {
+                remove1stNotification()
+            }
+        }
+
+        function remove1stNotification() {
+            if (mockModel.count > 1)
+                mockModel.remove(1)
+        }
+
+        Rectangle {
+            id: notificationsRect
+
+            width: units.gu(40)
+            height: units.gu(115)
+
+            MouseArea{
+                id: clickThroughCatcher
+
+                anchors.fill: parent
+            }
+
+            Notifications {
+                id: notifications
+
+                margin: units.gu(1)
+
+                anchors.fill: parent
+                model: mockModel
+            }
+        }
+
+        Rectangle {
+            id: interactiveControls
+
+            width: units.gu(30)
+            height: units.gu(115)
+            color: "grey"
+
+            Column {
+                spacing: units.gu(1)
+                anchors.fill: parent
+                anchors.margins: units.gu(1)
+
+                Button {
+                    width: parent.width
+                    text: "add a snap-decision"
+                    onClicked: rootRow.addSnapDecisionNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a 2over1 snap-decision"
+                    onClicked: rootRow.add2over1SnapDecisionNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an ephemeral"
+                    onClicked: rootRow.addEphemeralNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an non-shaped-icon-summary-body"
+                    onClicked: rootRow.addEphemeralNonShapedIconNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an icon-summary"
+                    onClicked: rootRow.addEphemeralIconSummaryNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add an interactive"
+                    onClicked: rootRow.addInteractiveNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a confirmation"
+                    onClicked: rootRow.addConfirmationNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "add a 2nd confirmation"
+                    onClicked: rootRow.add2ndConfirmationNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "remove 1st notification"
+                    onClicked: rootRow.remove1stNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "clear model"
+                    onClicked: rootRow.clearNotifications()
+                }
+            }
+        }
+
+        ActionModel {
+            id: myActionModel
+        }
+
+        UnityTestCase {
+            id: root
+            name: "NotificationRendererTest"
+            when: windowShown
+
+            function test_NotificationRenderer_data() {
+                return [
+                {
+                    tag: "Snap Decision with secondary icon and button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "true"},
+                    summary: "Tom Ato",
+                    body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [{ id: "ok_id", label: "Ok"},
+                              { id: "cancel_id", label: "Cancel"},
+                              { id: "notreally_id", label: "Not really"},
+                              { id: "noway_id", label: "messages:No way"},
+                              { id: "nada_id", label: "messages:Nada"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: true,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "2-over-1 Snap Decision with button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "true"},
+                    summary: "Theatre at Ferria Stadium",
+                    body: "at Ferria Stadium in Bilbao, Spain\n07578545317",
+                    icon: "",
+                    secondaryIcon: "",
+                    actions: [{ id: "ok_id", label: "Ok"},
+                              { id: "snooze_id", label: "Snooze"},
+                              { id: "view_id", label: "View"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: false,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: true,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification - icon-summary layout",
+                    type: Notification.Ephemeral,
+                    hints: {},
+                    summary: "Photo upload completed",
+                    body: "",
+                    icon: "../graphics/applicationIcons/facebook.png",
+                    secondaryIcon: "",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: false,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg",
+                            "suppress-sound": "true"},
+                    summary: "New comment successfully published",
+                    body: "",
+                    icon: "",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: false,
+                    interactiveAreaEnabled: false,
+                    iconVisible: false,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Interactive notification",
+                    type: Notification.Interactive,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Interactive notification",
+                    body: "This is a notification that can be clicked",
+                    icon: "../graphics/avatars/amanda.png",
+                    secondaryIcon: "",
+                    actions: [{ id: "reply_id", label: "Dummy"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Snap Decision without secondary icon and no button-tint",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Bro Coly",
+                    body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
+                    icon: "../graphics/avatars/anna_olsson.png",
+                    secondaryIcon: "",
+                    actions: [{ id: "accept_id", label: "Accept"},
+                              { id: "reject_id", label: "Reject"}],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "sound-file": "dummy.ogg"},
+                    summary: "Cole Raby",
+                    body: "I did not expect it to be that late.",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: true,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Ephemeral notification with non-shaped icon",
+                    type: Notification.Ephemeral,
+                    hints: {"x-canonical-private-affirmative-tint": "false",
+                            "x-canonical-non-shaped-icon": "true"},
+                    summary: "Contacts",
+                    body: "Synchronised contacts-database with cloud-storage.",
+                    icon: "image://theme/contacts-app",
+                    secondaryIcon: "",
+                    actions: [],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Confirmation notification with value",
+                    type: Notification.Confirmation,
+                    hints: {"x-canonical-non-shaped-icon": "true"},
+                    summary: "",
+                    body: "",
+                    icon: "image://theme/audio-volume-medium",
+                    secondaryIcon: "",
+                    value: 50,
+                    actions: [],
+                    summaryVisible: false,
+                    bodyVisible: false,
+                    iconVisible: false,
+                    centeredIconVisible: true,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: true,
+                    valueLabelVisible: false,
+                    valueTinted: false
+                },
+                {
+                    tag: "Confirmation notification with value, label and tint",
+                    type: Notification.Confirmation,
+                    hints: {"x-canonical-non-shaped-icon": "true",
+                            "x-canonical-value-bar-tint" : "true"},
+                    summary: "",
+                    body: "High Volume",
+                    icon: "image://theme/audio-volume-high",
+                    secondaryIcon: "",
+                    value: 85,
+                    actions: [],
+                    summaryVisible: false,
+                    bodyVisible: false,
+                    iconVisible: false,
+                    centeredIconVisible: true,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: false,
+                    hasSound: false,
+                    valueVisible: true,
+                    valueLabelVisible: true,
+                    valueTinted: true
+                }
+                ]
+            }
+
+            SignalSpy {
+                id: clickThroughSpy
+
+                target: clickThroughCatcher
+                signalName: "clicked"
+            }
+
+            SignalSpy {
+                id: actionSpy
+
+                target: mockModel
+                signalName: "actionInvoked"
+            }
+
+            function cleanup() {
+                clickThroughSpy.clear()
                 actionSpy.clear()
-                waitForRendering(notification)
-
-                // check if there's a ComboButton created due to more actions being passed
-                if (data.actions.length > 2) {
-                    var comboButton = findChild(notification, "notify_button2")
-                    tryCompareFunction(function() { return comboButton.expanded == false; }, true);
-
-                    // click to expand
-                    tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
-
-                    // try clicking on choices in expanded comboList
-                    var choiceButton1 = findChild(notification, "notify_button3")
-                    tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                    compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
-                    actionSpy.clear()
-
-                    var choiceButton2 = findChild(notification, "notify_button4")
-                    tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
-                    compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
-                    actionSpy.clear()
-
-                    // click to collapse
-                    //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);
-                } else {
-                    mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
-                    compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+            }
+
+            function test_NotificationRenderer(data) {
+                // populate model with some mock notifications
+                mockModel.append(data)
+
+                // make sure the view is properly updated before going on
+                notifications.forceLayout();
+                waitForRendering(notifications);
+
+                var notification = findChild(notifications, "notification" + (mockModel.count - 1))
+                verify(notification !== undefined, "notification wasn't found");
+
+                waitForRendering(notification);
+
+                var icon = findChild(notification, "icon")
+                var centeredIcon = findChild(notification, "centeredIcon")
+                var interactiveArea = findChild(notification, "interactiveArea")
+                var secondaryIcon = findChild(notification, "secondaryIcon")
+                var summaryLabel = findChild(notification, "summaryLabel")
+                var bodyLabel = findChild(notification, "bodyLabel")
+                var buttonRow = findChild(notification, "buttonRow")
+                var valueIndicator = findChild(notification, "valueIndicator")
+                var valueLabel = findChild(notification, "valueLabel")
+                var innerBar = findChild(notification, "innerBar")
+
+                compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
+                if (icon.visible) {
+                    compare(icon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+                compare(centeredIcon.visible, data.centeredIconVisible, "centered-icon visibility is incorrect")
+                if (centeredIcon.visible) {
+                    compare(centeredIcon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+                compare(valueIndicator.visible, data.valueVisible, "value-indicator visibility is incorrect")
+                if (valueIndicator.visible) {
+                    verify(innerBar.color === data.valueTinted ? UbuntuColors.orange : "white", "value-bar has the wrong color-tint")
+                }
+                compare(valueLabel.visible, data.valueLabelVisible, "value-label visibility is incorrect")
+
+                // test input does not fall through
+                mouseClick(notification, notification.width / 2, notification.height / 2)
+                if(data.type == Notification.Interactive) {
+                    actionSpy.wait()
+                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
+                }
+                compare(clickThroughSpy.count, 0, "click on notification fell through")
+
+                compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
+                compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
+                compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
+                compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
+
+                var audioItem = findInvisibleChild(notification, "sound")
+                compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")
+
+                if(data.buttonRowVisible) {
+                    var buttonCancel = findChild(buttonRow, "notify_button1")
+                    var buttonAccept = findChild(buttonRow, "notify_button0")
+
+                    // only test the left/cancel-button if two actions have been passed in
+                    if (data.actions.length == 2) {
+                        tryCompareFunction(function() { mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+                        actionSpy.clear()
+                    }
+
+                    // check the tinting of the positive/right button
+                    verify(buttonAccept.color === data.buttonTinted ? "#3fb24f" : "#dddddd", "button has the wrong color-tint")
+
+                    // click the positive/right button
+                    tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
+                    actionSpy.clear()
+                    waitForRendering (notification)
+
+                    // check if there's a ComboButton created due to more actions being passed
+                    if (data.actions.length > 2) {
+                        var comboButton = findChild(notification, "notify_button2")
+                        tryCompareFunction(function() { return comboButton.expanded == false; }, true);
+
+                        // click to expand
+                        tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == true; }, true);
+
+                        // try clicking on choices in expanded comboList
+                        var choiceButton1 = findChild(notification, "notify_button3")
+                        tryCompareFunction(function() { mouseClick(choiceButton1, choiceButton1.width / 2, choiceButton1.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")
+                        actionSpy.clear()
+
+                        var choiceButton2 = findChild(notification, "notify_button4")
+                        tryCompareFunction(function() { mouseClick(choiceButton2, choiceButton2.width / 2, choiceButton2.height / 2); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")
+                        actionSpy.clear()
+
+                        // click to collapse
+                        //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);
+                    } else {
+                        mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
+                        compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
+                    }
                 }
             }
         }

=== added file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2014-11-05 14:37:57 +0000
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../qml/Notifications"
+import Ubuntu.Components 0.1
+import Unity.Test 0.1
+import Unity.Notifications 1.0
+
+Item {
+    width: notificationsRect.width + interactiveControls.width
+    height: notificationsRect.height
+
+    Row {
+        id: rootRow
+
+        Component {
+            id: mockNotification
+
+            QtObject {
+                function invokeAction(actionId) {
+                    mockModel.actionInvoked(actionId)
+                }
+            }
+        }
+
+        ListModel {
+            id: mockModel
+            dynamicRoles: true
+
+            signal actionInvoked(string actionId)
+
+            function getRaw(id) {
+                return mockNotification.createObject(mockModel)
+            }
+
+            // add the default/PlaceHolder notification to the model
+            Component.onCompleted: {
+                var n = {
+                    type: Notification.PlaceHolder,
+                    hints: {},
+                    summary: "",
+                    body: "",
+                    icon: "",
+                    secondaryIcon: "",
+                    actions: []
+                }
+
+                append(n)
+            }
+        }
+
+        function addSwipeToActNotification() {
+            var n = {
+                type: Notification.SnapDecision,
+                hints: {"x-canonical-snap-decisions-swipe": "true"},
+                summary: "Incoming call",
+                body: "Frank Zappa\n+44 (0)7736 027340",
+                icon: "../graphics/avatars/amanda.png",
+                secondaryIcon: "incoming-call",
+                actions: [{ id: "ok_id", label: "Ok"},
+                    { id: "cancel_id", label: "Cancel"}]
+            }
+
+            mockModel.append(n)
+        }
+
+        function clearNotifications() {
+            mockModel.clear()
+        }
+
+        function remove1stNotification() {
+            if (mockModel.count > 0)
+                mockModel.remove(0)
+        }
+
+        Rectangle {
+            id: notificationsRect
+
+            width: units.gu(40)
+            height: units.gu(71)
+
+            MouseArea{
+                id: clickThroughCatcher
+
+                anchors.fill: parent
+            }
+
+            Notifications {
+                id: notifications
+
+                margin: units.gu(1)
+
+                anchors.fill: parent
+                model: mockModel
+            }
+        }
+
+        Rectangle {
+            id: interactiveControls
+
+            width: units.gu(30)
+            height: units.gu(81)
+            color: "grey"
+
+            Column {
+                spacing: units.gu(1)
+                anchors.fill: parent
+                anchors.margins: units.gu(1)
+
+                Button {
+                    width: parent.width
+                    text: "add a SwipeToAct snap-decision"
+                    onClicked: rootRow.addSwipeToActNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "remove 1st notification"
+                    onClicked: rootRow.remove1stNotification()
+                }
+
+                Button {
+                    width: parent.width
+                    text: "clear model"
+                    onClicked: rootRow.clearNotifications()
+                }
+            }
+        }
+
+        ActionModel {
+            id: myActionModel
+        }
+
+        UnityTestCase {
+            id: root
+            name: "NotificationRendererTest"
+            when: windowShown
+
+            function test_NotificationRenderer_data() {
+                return [
+                {
+                    tag: "Snap Decision with SwipeToAct-widget (accept)",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-snap-decisions-swipe": "true"},
+                    summary: "Incoming call",
+                    body: "Frank Zappa\n+44 (0)7736 027340",
+                    icon: "../graphics/avatars/amanda.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: myActionModel,
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    checkSwipeToActAccept: true,
+                    checkSwipeToActReject: false
+                },
+                {
+                    tag: "Snap Decision with SwipeToAct-widget (reject)",
+                    type: Notification.SnapDecision,
+                    hints: {"x-canonical-snap-decisions-swipe": "true"},
+                    summary: "Incoming call",
+                    body: "Bro Coly\n+49 (0)221 426973",
+                    icon: "../graphics/avatars/funky.png",
+                    secondaryIcon: "../graphics/applicationIcons/facebook.png",
+                    actions: myActionModel,
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: true,
+                    shaped: true,
+                    secondaryIconVisible: true,
+                    buttonRowVisible: true,
+                    buttonTinted: false,
+                    checkSwipeToActAccept: false,
+                    checkSwipeToActReject: true
+                }
+                ]
+            }
+
+            SignalSpy {
+                id: clickThroughSpy
+
+                target: clickThroughCatcher
+                signalName: "clicked"
+            }
+
+            SignalSpy {
+                id: actionSpy
+
+                target: mockModel
+                signalName: "actionInvoked"
+            }
+
+            function cleanup() {
+                clickThroughSpy.clear()
+                actionSpy.clear()
+            }
+
+            function test_NotificationRenderer(data) {
+                // populate model with some mock notifications
+                mockModel.append(data)
+
+                // make sure the view is properly updated before going on
+                notifications.forceLayout();
+                waitForRendering(notifications);
+
+                var notification = findChild(notifications, "notification" + (mockModel.count - 1))
+                verify(notification !== undefined, "notification wasn't found");
+
+                waitForRendering(notification);
+
+                var icon = findChild(notification, "icon")
+                var interactiveArea = findChild(notification, "interactiveArea")
+                var secondaryIcon = findChild(notification, "secondaryIcon")
+                var summaryLabel = findChild(notification, "summaryLabel")
+                var bodyLabel = findChild(notification, "bodyLabel")
+                var buttonRow = findChild(notification, "buttonRow")
+
+                compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
+                if (icon.visible) {
+                    compare(icon.shaped, data.shaped, "shaped-status is incorrect")
+                }
+
+                // test input does not fall through
+                mouseClick(notification, notification.width / 2, notification.height / 2)
+                if(data.type == Notification.Interactive) {
+                    actionSpy.wait()
+                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
+                }
+                compare(clickThroughSpy.count, 0, "click on notification fell through")
+
+                compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
+                compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
+                compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
+                compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
+
+                if(data.buttonRowVisible) {
+                    var swipeButton = findChild(buttonRow, "notify_swipe_button")
+                    var slider = findChild(swipeButton, "slider")
+                    var swipeMouseArea = findChild(swipeButton, "swipeMouseArea")
+                    var x = swipeMouseArea.width / 2
+                    var y = swipeMouseArea.height / 2
+
+                    if(data.checkSwipeToActAccept) {
+                        tryCompareFunction(function() { mouseDrag(slider, x, y, (swipeMouseArea.width / 2) - slider.width, 0); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(0, ActionModel.RoleActionId), "got wrong id for positive action")
+                        actionSpy.clear()
+                    }
+                    if(data.checkSwipeToActReject) {
+                        tryCompareFunction(function() { mouseDrag(slider, x, y, -(swipeMouseArea.width / 2), 0); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(1, ActionModel.RoleActionId), "got wrong id for negative action")
+                        actionSpy.clear()
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-09-29 15:04:42 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-11-05 14:37:57 +0000
@@ -740,7 +740,7 @@
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
         }
 
-        function test_lp1336715_broken_checkbox_bindings() {
+        function test_lp1336715_broken_switch_bindings() {
             menuData.type = "com.canonical.indicator.switch";
             menuData.sensitive = true;
             menuData.isToggled = false;
@@ -758,5 +758,21 @@
 
             compare(loader.item.checked, false, "Server updates no longer working");
         }
+
+        // test that the server value is re-aserted if it is not confirmed.
+        function test_lp1336715_switch_server_value_reassertion() {
+            menuData.type = "com.canonical.indicator.switch";
+            menuData.sensitive = true;
+            menuData.isToggled = false;
+
+            loader.data = menuData;
+            loader.sourceComponent = factory.load(menuData);
+
+            compare(loader.item.checked, false, "Loader did not load check state");
+            mouseClick(loader.item,
+                       loader.item.width / 2, loader.item.height / 2);
+            compare(loader.item.checked, true, "Clicking switch menu should toggle check");
+            tryCompare(loader.item, "checked", false);
+        }
     }
 }

=== modified file 'tests/qmltests/Panel/tst_IndicatorPage.qml'
--- tests/qmltests/Panel/tst_IndicatorPage.qml	2014-10-17 14:55:35 +0000
+++ tests/qmltests/Panel/tst_IndicatorPage.qml	2014-11-05 14:37:57 +0000
@@ -18,6 +18,7 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators
+import Ubuntu.Settings.Menus 0.1 as Menus
 import "../../../qml/Panel"
 
 Item {
@@ -33,8 +34,24 @@
         busName: "com.caninical.indicator.test"
         actionsObjectPath: "/com/canonical/indicator/test"
         menuObjectPath: "/com/canonical/indicator/test"
+
+        factory {
+            _map: {
+                "default": {
+                    "com.canonical.indicator.test" : testMenu
+                }
+            }
+        }
     }
 
+   Component {
+       id: testMenu
+       Menus.StandardMenu {
+           signal menuSelected
+           signal menuDeselected
+       }
+   }
+
     property var fullMenuData: [{
             "rowData": {                // 1
                 "label": "root",
@@ -51,39 +68,39 @@
             },
             "submenu": [{
                 "rowData": {                // 1.1
-                    "label": "menu1",
+                    "label": "menu0",
                     "sensitive": true,
                     "isSeparator": false,
                     "icon": "",
-                    "type": "",
+                    "type": "com.canonical.indicator.test",
                     "ext": {},
-                    "action": "",
+                    "action": "menu0",
                     "actionState": {},
                     "isCheck": false,
                     "isRadio": false,
                     "isToggled": false,
                 }}, {
                "rowData": {                // 1.2
-                   "label": "menu2",
+                   "label": "menu1",
                    "sensitive": true,
                    "isSeparator": false,
                    "icon": "",
-                   "type": "",
+                   "type": "com.canonical.indicator.test",
                    "ext": {},
-                   "action": "",
+                   "action": "menu1",
                    "actionState": {},
                    "isCheck": false,
                    "isRadio": false,
                    "isToggled": false,
                }}, {
                "rowData": {                // row 1.2
-                   "label": "menu3",
+                   "label": "menu2",
                    "sensitive": true,
                    "isSeparator": false,
                    "icon": "",
-                   "type": "",
+                   "type": "com.canonical.indicator.test",
                    "ext": {},
-                   "action": "",
+                   "action": "menu2",
                    "actionState": {},
                    "isCheck": false,
                    "isRadio": false,
@@ -147,5 +164,33 @@
             var mainMenu = findChild(page, "mainMenu");
             tryCompare(mainMenu, "count", data.expectedCount);
         }
+
+        function test_remove_selected_item_data() {
+            return [
+                { remove: 0 },
+                { remove: 2 },
+            ]
+        }
+
+        function test_remove_selected_item(data) {
+            var mainMenu = findChild(page, "mainMenu");
+            initializeMenuData(fullMenuData);
+
+            var menuId = "menu"+data.remove
+
+            tryCompareFunction(function() { return findChild(page, menuId) !== null;}, true);
+            var menu = findChild(page, menuId);
+
+            menu.menuSelected();
+            compare(mainMenu.currentIndex, data.remove, "Incorrect index selected");
+            mainMenu.model.removeRow(data.remove);
+
+            compare(mainMenu.currentIndex, -1, "Current index should be reset after current item removal");
+
+            // now make sure selecting a new menu works.
+            var menu1 = findChild(page, "menu1");
+            menu1.menuSelected();
+            compare(menu1.selected, true, "Item not selected");
+        }
     }
 }

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-10-30 21:40:34 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-11-05 14:37:57 +0000
@@ -160,6 +160,7 @@
             AccountsService.enableLauncherWhileLocked = true
             AccountsService.enableIndicatorsWhileLocked = true
             AccountsService.demoEdges = false
+            callManager.foregroundCall = null
 
             // reload our test subject to get it in a fresh state once again
             shellLoader.active = true
@@ -212,6 +213,7 @@
             tryCompare(lockscreen, "shown", false)
             tryCompare(greeter, "hasLockedApp", true)
             tryCompare(greeter, "lockedApp", app)
+            tryCompare(LightDM.Greeter, "active", true)
             tryCompare(ApplicationManager, "focusedApplicationId", app)
         }
 
@@ -386,5 +388,61 @@
             callManager.foregroundCall = phoneCall
             confirmLockedApp("dialer-app")
         }
+
+        function test_emergencyDialerActiveCallPanel() {
+            // Make sure that the following sequence works:
+            // - Enter emergency mode call
+            // - Return to greeter
+            // - Click on active call panel
+            // - Should be back in emergency mode dialer
+
+            var greeter = findChild(shell, "greeter");
+            var lockscreen = findChild(shell, "lockscreen");
+
+            lockscreen.emergencyCall();
+            confirmLockedApp("dialer-app");
+            callManager.foregroundCall = phoneCall;
+
+            LightDM.Greeter.showGreeter();
+            tryCompare(lockscreen, "shown", true);
+            tryCompare(greeter, "hasLockedApp", false);
+
+            // simulate a callHint press, the real thing requires dialer: url support
+            ApplicationManager.requestFocusApplication("dialer-app");
+
+            confirmLockedApp("dialer-app");
+        }
+
+        function test_normalDialerActiveCallPanel() {
+            // Make sure that the following sequence works:
+            // - Log in
+            // - Start a call
+            // - Switch apps
+            // - Click on active call panel
+            // - Should be back in normal dialer
+            // (we've had a bug where we locked screen in this case)
+
+            var lockscreen = findChild(shell, "lockscreen");
+            var panel = findChild(shell, "panel");
+
+            enterPin("1234");
+            tryCompare(lockscreen, "shown", false);
+            tryCompare(LightDM.Greeter, "active", false);
+
+            ApplicationManager.startApplication("dialer-app", ApplicationManager.NoFlag);
+            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
+            callManager.foregroundCall = phoneCall;
+
+            ApplicationManager.requestFocusApplication("unity8-dash");
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+            tryCompare(panel.callHint, "visible", true);
+
+            // simulate a callHint press, the real thing requires dialer: url support
+            ApplicationManager.requestFocusApplication("dialer-app");
+
+            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
+            tryCompare(lockscreen, "shown", false);
+            tryCompare(LightDM.Greeter, "active", false);
+        }
     }
 }