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

[Michał Sawicz]

[lp:~unity-team/unity8/rtm-20150213]

1423. By Michał Sawicz on 2015-02-13

Add changelog

1424. By Josh Arenson on 2015-02-16

Create a PhysicalKeyMapper to handle all physical/hardware keys

In addition, change the key combination for taking a screenshot from (Volume Up + Volume Down) to (Power + Volume Down).

1425. By Michał Sawicz on 2015-02-16

Update changelog

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-22 20:47:05 +0000
+++ debian/changelog	2015-02-16 22:20:44 +0000
@@ -1,3 +1,29 @@
+unity8 (8.02+15.04.20150213~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Albert astals ]
+  * Preserve the aspect ratio for the card attribute images
+
+  [ Andrea Cimitan ]
+  * support background on horizontal cards with summary (LP: #1393008)
+  * Background needs to be specified to be visible in horizontal cards
+  (LP: #1411748)
+
+  [ Daniel d'Andrada ]
+  * Don't show() the lockscreen if it's already being shown
+
+  [ Joshua Arenson ]
+  * Create a PhysicalKeyMapper to handle all physical/hardware keys
+
+  [ Michał Sawicz ]
+  * Create a PhysicalKeyMapper to handle all physical/hardware keys
+
+  [ Mirco Müller ]
+  * Allow swipe-to-dismiss for contracted snap-decision notifications,
+    interactive notifications and ephemeral notifications. (LP:
+    #1355422, #1334855)
+
+ -- Michał Sawicz <[e-mail]>  Fri, 13 Feb 2015 17:23:13 +0100
+
 unity8 (8.02+15.04.20150122.2~rtm-0ubuntu1) 14.09; urgency=medium
 
   [ Michael Terry ]
 
=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2014-10-14 15:40:59 +0000
+++ plugins/Dash/CardAttributes.qml	2015-02-16 22:20:44 +0000
@@ -51,6 +51,8 @@
                 id: icon
                 height: units.gu(2)
                 sets: ["actions", "status", "apps"]
+                // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
+                width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
                 source: "icon" in modelData && modelData["icon"] || ""
                 color: grid.color
             }
 
=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-01-08 12:51:33 +0000
+++ plugins/Dash/CardCreator.js	2015-02-16 22:20:44 +0000
@@ -224,6 +224,8 @@
 
 // %1 is used as extra anchors of emblemIcon
 // %2 is used as color of emblemIcon
+// FIXME The width code is a
+// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
 var kEmblemIconCode = 'StatusIcon { \n\
                             id: emblemIcon; \n\
                             objectName: "emblemIcon"; \n\
@@ -235,6 +237,7 @@
                             source: cardData && cardData["emblem"] || ""; \n\
                             color: %2; \n\
                             height: source != "" ? titleLabel.font.pixelSize : 0; \n\
+                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
                         }\n';
 
 // %1 is used as anchors of touchdown effect
@@ -320,7 +323,8 @@
     var hasSummary = components["summary"] || false;
     var artAndSummary = hasArt && hasSummary;
     var isHorizontal = template["card-layout"] === "horizontal";
-    var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
+    var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
+                        (hasSummary && (template["card-background"] || components["background"]));
     var hasTitle = components["title"] || false;
     var hasMascot = components["mascot"] || false;
     var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
 
=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-01-14 09:09:08 +0000
+++ qml/Components/Dialogs.qml	2015-02-16 22:20:44 +0000
@@ -28,21 +28,12 @@
     // in other applications like the welcome wizard.
     readonly property string domain: "unity8"
 
-    function onPowerKeyPressed() {
-        // FIXME: event.isAutoRepeat is always false on Nexus 4.
-        // So we use powerKeyTimer.running to avoid the PowerOff key repeat
-        // https://launchpad.net/bugs/1349416
-        if (!powerKeyTimer.running) {
-            powerKeyTimer.restart();
-        }
-    }
-
-    function onPowerKeyReleased() {
-        powerKeyTimer.stop();
-    }
-
     signal powerOffClicked();
 
+    function showPowerDialog() {
+        d.showPowerDialog();
+    }
+
     QtObject {
         id: d // private stuff
 
@@ -56,17 +47,6 @@
         }
     }
 
-    Timer {
-        id: powerKeyTimer
-        interval: 2000
-        repeat: false
-        triggeredOnStart: false
-
-        onTriggered: {
-            d.showPowerDialog();
-        }
-    }
-
     Component {
         id: logoutDialog
         Dialog {
 
=== added file 'qml/Components/PhysicalKeysMapper.qml'
--- qml/Components/PhysicalKeysMapper.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/PhysicalKeysMapper.qml	2015-02-16 22:20:44 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2014-2015 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 Powerd 0.1
+
+/*!
+ \brief A mapper for the physical keys on the device
+
+ A mapper to handle events triggered by pressing physical keys on a device.
+ Keys included are
+    * Volume Decrease
+    * Volume Increase
+    * Power
+
+ This allows for handling the following events
+    * Power dialog
+    * Volume Decreases/Increases
+    * Screenshots
+
+*/
+
+Item {
+    id: root
+
+    signal powerKeyLongPressed;
+    signal volumeDownTriggered;
+    signal volumeUpTriggered;
+    signal screenshotTriggered;
+
+    QtObject {
+        id: d
+
+        property bool volumeDownKeyPressed: false
+        property bool volumeUpKeyPressed: false
+        property bool ignoreVolumeEvents: false
+    }
+
+    Timer {
+        id: powerKeyLongPressTimer
+
+        interval: 2000
+        onTriggered: root.powerKeyLongPressed();
+    }
+
+
+    function onKeyPressed(event) {
+        if ((event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff)
+            && !event.isAutoRepeat) {
+
+            // FIXME: We only consider power key presses if the screen is
+            // on because of bugs 1410830/1409003.  The theory is that when
+            // those bugs are encountered, there is a >2s delay between the
+            // power press event and the power release event, which causes
+            // the shutdown dialog to appear on resume.  So to avoid that
+            // symptom while we investigate the root cause, we simply won't
+            // initiate any dialogs when the screen is off.
+            if (Powerd.status === Powerd.On) {
+                powerKeyLongPressTimer.restart();
+            }
+            event.accepted = true;
+        } else if ((event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay)
+                   && !event.isAutoRepeat) {
+            event.accepted = callManager.handleMediaKey(false);
+        } else if (event.key == Qt.Key_VolumeDown) {
+            if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeDownTriggered();
+            else if (!event.isAutoRepeat) {
+                if (d.volumeUpKeyPressed) {
+                    if (Powerd.status === Powerd.On) root.screenshotTriggered();
+                    d.ignoreVolumeEvents = true;
+                }
+                d.volumeDownKeyPressed = true;
+            }
+        } else if (event.key == Qt.Key_VolumeUp) {
+            if (event.isAutoRepeat && !d.ignoreVolumeEvents) root.volumeUpTriggered();
+            else if (!event.isAutoRepeat) {
+                if (d.volumeDownKeyPressed) {
+                    if (Powerd.status === Powerd.On) root.screenshotTriggered();
+                    d.ignoreVolumeEvents = true;
+                }
+                d.volumeUpKeyPressed = true;
+            }
+        }
+    }
+
+    function onKeyReleased(event) {
+        if (event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff) {
+            powerKeyLongPressTimer.stop();
+            event.accepted = true;
+        } else if (event.key == Qt.Key_VolumeDown) {
+            if (!d.ignoreVolumeEvents) root.volumeDownTriggered();
+            d.volumeDownKeyPressed = false;
+            if (!d.volumeUpKeyPressed) d.ignoreVolumeEvents = false;
+        } else if (event.key == Qt.Key_VolumeUp) {
+            if (!d.ignoreVolumeEvents) root.volumeUpTriggered();
+            d.volumeUpKeyPressed = false;
+            if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
+        }
+    }
+}
 
=== removed file 'qml/Components/VolumeKeyFilter.qml'
--- qml/Components/VolumeKeyFilter.qml	2015-01-14 10:24:49 +0000
+++ qml/Components/VolumeKeyFilter.qml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * 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/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-11-10 09:14:30 +0000
+++ qml/Notifications/Notification.qml	2015-02-16 22:20:44 +0000
@@ -40,6 +40,7 @@
     property bool fullscreen: false
     property int maxHeight
     property int margins
+    readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
     readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
     readonly property color red: "#fc4949"
     readonly property color green: "#3fb24f"
@@ -52,7 +53,7 @@
     implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height - shapedBack.anchors.topMargin + contentSpacing * 2) : 0
 
     color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) || darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
-    opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
+    opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
 
     state: {
         var result = "";
@@ -80,18 +81,28 @@
         id: sound
         objectName: "sound"
         audioRole: MediaPlayer.alert
-        source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
+        source: hints["suppress-sound"] !== "true" && hints["sound-file"] !== undefined ? hints["sound-file"] : ""
     }
 
     // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
     Component.onCompleted: {
-        if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source != "") {
+        if (opacity == 1.0 && hints["suppress-sound"] !== "true" && sound.source !== "") {
             sound.play();
         }
     }
 
+    Behavior on x {
+        id: normalXBehavior
+
+        enabled: draggable
+        UbuntuNumberAnimation {
+            duration: UbuntuAnimation.FastDuration
+            easing.type: Easing.OutBounce
+        }
+    }
+
     onHintsChanged: {
-        if (type === Notification.Confirmation && opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source != "") {
+        if (type === Notification.Confirmation && opacity == 1.0 && hints["suppress-sound"] !== "true" && sound.source !== "") {
             sound.play();
         }
     }
@@ -146,6 +157,12 @@
         opacity: parent.opacity
     }
 
+    onXChanged: {
+        if (draggable && notification.x > 0.75 * notification.width) {
+            notification.notification.close()
+        }
+    }
+
     Item {
         id: contents
         anchors.fill: fullscreen ? nonShapedBack : shapedBack
@@ -169,7 +186,7 @@
             actions: paths.actions
             menuObjectPath: paths.menuObjectPath
             onNameOwnerChanged: {
-                if (lastNameOwner != "" && nameOwner == "" && notification.notification != undefined) {
+                if (lastNameOwner !== "" && nameOwner === "" && notification.notification !== undefined) {
                     notification.notification.close()
                 }
                 lastNameOwner = nameOwner
@@ -181,6 +198,12 @@
 
             anchors.fill: parent
             objectName: "interactiveArea"
+
+            drag.target: draggable ? notification : undefined
+            drag.axis: Drag.XAxis
+            drag.minimumX: 0
+            drag.maximumX: notification.width
+
             onClicked: {
                 if (notification.type == Notification.Interactive) {
                     notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
@@ -188,6 +211,13 @@
                     notificationList.currentIndex = index;
                 }
             }
+            onReleased: {
+                if (notification.x < notification.width / 2) {
+                    notification.x = 0
+                } else {
+                    notification.x = notification.width
+                }
+            }
         }
 
         Column {
@@ -447,7 +477,7 @@
                     right: parent.right
                     margins: contentSpacing
                 }
-                visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
+                visible: notification.type === Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
                 spacing: units.gu(2)
                 layoutDirection: Qt.RightToLeft
 
 
=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2014-10-30 21:42:32 +0000
+++ qml/Notifications/Notifications.qml	2015-02-16 22:20:44 +0000
@@ -41,15 +41,11 @@
     property bool topmostIsFullscreen: false
     spacing: topmostIsFullscreen ? 0 : units.gu(.5)
 
-    // FIXME: This doesn't make any sense and results in a binding loop
-    currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
+    currentIndex: count > 1 ? 1 : -1
 
     delegate: Notification {
         objectName: "notification" + index
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
+        width: parent.width
         type: model.type
         hints: model.hints
         iconSource: model.icon
 
=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-01-14 10:17:12 +0000
+++ qml/Panel/IndicatorItem.qml	2015-02-16 22:20:44 +0000
@@ -95,6 +95,8 @@
                         id: itemImage
                         objectName: "icon"+index
                         height: iconHeight
+                        // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
+                        width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
                         source: modelData
                         sets: ["status", "actions"]
                         color: root.color
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-01-22 02:41:55 +0000
+++ qml/Shell.qml	2015-02-16 22:20:44 +0000
@@ -136,6 +136,15 @@
         objectName: "dashCommunicator"
     }
 
+    PhysicalKeysMapper {
+        id: physicalKeysMapper
+
+        onPowerKeyLongPressed: dialogs.showPowerDialog()
+        onVolumeDownTriggered: volumeControl.volumeDown();
+        onVolumeUpTriggered: volumeControl.volumeUp();
+        onScreenshotTriggered: screenGrabber.capture();
+    }
+
     ScreenGrabber {
         id: screenGrabber
         z: edgeDemo.z + 10
@@ -148,45 +157,9 @@
         value: launcher.shown || launcher.dashSwipe
     }
 
-    VolumeKeyFilter {
-        id: volumeKeyFilter
-        onVolumeDownPressed: volumeControl.volumeDown()
-        onVolumeUpPressed: volumeControl.volumeUp()
-        onBothVolumeKeysPressed: screenGrabber.capture()
-    }
-
     WindowKeysFilter {
-        Keys.onPressed: {
-            // Nokia earpieces give TogglePlayPause, while the iPhone's earpiece gives Play
-            if (event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) {
-                event.accepted = callManager.handleMediaKey(false);
-            } else if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-                // FIXME: We only consider power key presses if the screen is
-                // on because of bugs 1410830/1409003.  The theory is that when
-                // those bugs are encountered, there is a >2s delay between the
-                // power press event and the power release event, which causes
-                // the shutdown dialog to appear on resume.  So to avoid that
-                // symptom while we investigate the root cause, we simply won't
-                // initiate any dialogs when the screen is off.
-                if (Powerd.status === Powerd.On) {
-                    dialogs.onPowerKeyPressed();
-                }
-                event.accepted = true;
-            } else {
-                volumeKeyFilter.onKeyPressed(event.key);
-                event.accepted = false;
-            }
-        }
-
-        Keys.onReleased: {
-            if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-                dialogs.onPowerKeyReleased();
-                event.accepted = true;
-            } else {
-                volumeKeyFilter.onKeyReleased(event.key);
-                event.accepted = false;
-            }
-        }
+        Keys.onPressed: physicalKeysMapper.onKeyPressed(event);
+        Keys.onReleased: physicalKeysMapper.onKeyReleased(event);
     }
 
     Item {
@@ -364,7 +337,7 @@
         onShownChanged: if (shown) greeter.lockedApp = ""
 
         function maybeShow() {
-            if (!shell.forcedUnlock) {
+            if (!shell.forcedUnlock && !shown) {
                 showNow();
             }
         }
 
=== modified file 'tests/mocks/Unity/Notifications/CMakeLists.txt'
--- tests/mocks/Unity/Notifications/CMakeLists.txt	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/CMakeLists.txt	2015-02-16 22:20:44 +0000
@@ -4,7 +4,8 @@
 
 set(MockNotificationsPlugin_SOURCES
     plugin.cpp
-    MockNotificationTypes.cpp
+    MockNotification.cpp
+    MockNotificationModel.cpp
     MockActionModel.cpp
 )
 
 
=== modified file 'tests/mocks/Unity/Notifications/MockActionModel.cpp'
--- tests/mocks/Unity/Notifications/MockActionModel.cpp	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.cpp	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -25,8 +25,6 @@
 };
 
 ActionModel::ActionModel(QObject *parent) : QStringListModel(parent), p(new ActionModelPrivate) {
-    insertAction("ok_id", "Ok");
-    insertAction("cancel_id", "Cancel");
 }
 
 ActionModel::~ActionModel() {
@@ -66,7 +64,11 @@
     return data(index(row, 0), role);
 }
 
-void ActionModel::insertAction(const QString &id, const QString &label) {
+void ActionModel::append(const QString &id, const QString &label) {
     p->ids.push_back(id);
     p->labels.push_back(label);
 }
+
+int ActionModel::getCount() const {
+    return p->labels.size();
+}
 
=== modified file 'tests/mocks/Unity/Notifications/MockActionModel.h'
--- tests/mocks/Unity/Notifications/MockActionModel.h	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -26,6 +26,7 @@
 
 class ActionModel : public QStringListModel {
     Q_OBJECT
+    Q_PROPERTY(int count READ getCount)
 
 public:
     ActionModel(QObject *parent=nullptr);
@@ -42,7 +43,8 @@
     };
     Q_INVOKABLE QVariant data(int row, int role) const;
 
-    void insertAction(const QString &id, const QString &label);
+    Q_INVOKABLE void append(const QString &id, const QString &label);
+    int getCount() const;
 
 private:
     QScopedPointer<ActionModelPrivate> p;
 
=== renamed file 'tests/mocks/Unity/Notifications/MockNotificationTypes.cpp' => 'tests/mocks/Unity/Notifications/MockNotification.cpp'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.cpp	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/MockNotification.cpp	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -17,10 +17,162 @@
  *      Mirco Mueller <[e-mail]>
  */
 
-#include "MockNotificationTypes.h"
-
-MockNotification::MockNotification(QObject *parent) : QObject(parent) {
+#include "MockNotification.h"
+
+#include <QDebug>
+
+struct MockNotificationPrivate {
+    int id;
+    QString summary;
+    QString body;
+    int value;
+    MockNotification::Type type;
+    QString icon;
+    QString secondaryIcon;
+    QStringList actions;
+    ActionModel* actionsModel;
+    QVariantMap hints;
+};
+
+MockNotification::MockNotification(QObject *parent) : QObject(parent), p(new MockNotificationPrivate()) {
+    p->actionsModel = new ActionModel();
 }
 
 MockNotification::~MockNotification() {
 }
+
+QString MockNotification::getSummary() const {
+    return p->summary;
+}
+
+void MockNotification::setSummary(const QString &summary) {
+    if(p->summary != summary) {
+        p->summary = summary;
+        Q_EMIT summaryChanged(p->summary);
+        Q_EMIT dataChanged(p->id);
+    }
+}
+
+QString MockNotification::getBody() const {
+    return p->body;
+}
+
+void MockNotification::setBody(const QString &body) {
+    if(p->body != body) {
+        p->body = body;
+        Q_EMIT bodyChanged(p->body);
+        Q_EMIT dataChanged(p->id);
+    }
+}
+
+int MockNotification::getID() const {
+    return p->id;
+}
+
+void MockNotification::setID(const int id) {
+    p->id = id;
+}
+
+int MockNotification::getValue() const {
+    return p->value;
+}
+
+void MockNotification::setValue(int value) {
+    if(p->value != value) {
+        p->value = value;
+        Q_EMIT valueChanged(p->value);
+        Q_EMIT dataChanged(p->id);
+    }
+}
+
+QString MockNotification::getIcon() const {
+    return p->icon;
+}
+
+void MockNotification::setIcon(const QString &icon) {
+    if (icon.startsWith(" ") || icon.size() == 0) {
+        p->icon = nullptr;
+    }
+    else {
+        p->icon = icon;
+
+        if (icon.indexOf("/") == -1) {
+            p->icon.prepend("image://theme/");
+        }
+    }
+
+    Q_EMIT iconChanged(p->icon);
+    Q_EMIT dataChanged(p->id);
+}
+
+QString MockNotification::getSecondaryIcon() const {
+    return p->secondaryIcon;
+}
+
+void MockNotification::setSecondaryIcon(const QString &secondaryIcon) {
+    if (secondaryIcon.startsWith(" ") || secondaryIcon.size() == 0) {
+        p->secondaryIcon = nullptr;
+    }
+    else {
+        p->secondaryIcon = secondaryIcon;
+
+        if (secondaryIcon.indexOf("/") == -1) {
+            p->secondaryIcon.prepend("image://theme/");
+        }
+    }
+
+    Q_EMIT secondaryIconChanged(p->secondaryIcon);
+    Q_EMIT dataChanged(p->id);
+}
+
+MockNotification::Type MockNotification::getType() const {
+    return p->type;
+}
+
+void MockNotification::setType(Type type) {
+    if(p->type != type) {
+        p->type = type;
+        Q_EMIT typeChanged(p->type);
+    }
+}
+
+ActionModel* MockNotification::getActions() const {
+    return p->actionsModel;
+}
+
+void MockNotification::setActions(const QStringList &actions) {
+    if(p->actions != actions) {
+        p->actions = actions;
+        Q_EMIT actionsChanged(p->actions);
+
+        for (int i = 0; i < p->actions.size(); i += 2) {
+            p->actionsModel->append(p->actions[i], p->actions[i+1]);
+        }
+    }
+}
+
+QVariantMap MockNotification::getHints() const {
+    return p->hints;
+}
+
+void MockNotification::setHints(const QVariantMap& hints) {
+    if (p->hints != hints) {
+        p->hints = hints;
+        Q_EMIT hintsChanged(p->hints);
+    }
+}
+
+void MockNotification::invokeAction(const QString &action) {
+    for(int i=0; i<p->actions.size(); i++) {
+        if(p->actions[i] == action) {
+            Q_EMIT actionInvoked(action);
+            qDebug() << "Info: invoked action" << action;
+            return;
+        }
+    }
+    fprintf(stderr, "Error: tried to invoke action not in actionList.\n");
+}
+
+void MockNotification::close() {
+    Q_EMIT completed(p->id);
+}
 
=== renamed file 'tests/mocks/Unity/Notifications/MockNotificationTypes.h' => 'tests/mocks/Unity/Notifications/MockNotification.h'
--- tests/mocks/Unity/Notifications/MockNotificationTypes.h	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/MockNotification.h	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -17,20 +17,78 @@
  *      Mirco Mueller <[e-mail]>
  */
 
-#ifndef MOCK_NOTIFICATION_TYPES_H
-#define MOCK_NOTIFICATION_TYPES_H
+#ifndef MOCK_NOTIFICATION_H
+#define MOCK_NOTIFICATION_H
 
+#include "MockActionModel.h"
 #include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QScopedPointer>
+
+struct MockNotificationPrivate;
 
 class MockNotification : public QObject {
     Q_OBJECT
     Q_ENUMS(Type)
+    Q_PROPERTY(QString summary READ getSummary WRITE setSummary NOTIFY summaryChanged)
+    Q_PROPERTY(QString body READ getBody WRITE setBody NOTIFY bodyChanged)
+    Q_PROPERTY(int nid READ getID WRITE setID NOTIFY idChanged)
+    Q_PROPERTY(int value READ getValue WRITE setValue NOTIFY valueChanged)
+    Q_PROPERTY(QString icon READ getIcon WRITE setIcon NOTIFY iconChanged)
+    Q_PROPERTY(QString secondaryIcon READ getSecondaryIcon WRITE setSecondaryIcon NOTIFY secondaryIconChanged)
+    Q_PROPERTY(Type type READ getType WRITE setType NOTIFY typeChanged)
+    Q_PROPERTY(QStringList rawActions WRITE setActions)
+    Q_PROPERTY(ActionModel* actions READ getActions NOTIFY actionsChanged)
+    Q_PROPERTY(QVariantMap hints READ getHints WRITE setHints NOTIFY hintsChanged)
+
+private:
+    QScopedPointer<MockNotificationPrivate> p;
+
+public:
+    enum Urgency { Low, Normal, Critical };
+    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
+
+Q_SIGNALS:
+    void summaryChanged(const QString &summary);
+    void bodyChanged(const QString &body);
+    void idChanged(const int id);
+    void valueChanged(int value);
+    void iconChanged(const QString &icon);
+    void secondaryIconChanged(const QString &secondaryIcon);
+    void typeChanged(Type type);
+    void actionsChanged(const QStringList &actions);
+    void hintsChanged(const QVariantMap& hints);
+
+    void dataChanged(int nid);
+    void completed(int nid);
+    void actionInvoked(const QString &action);
 
 public:
     MockNotification(QObject *parent=nullptr);
     virtual ~MockNotification();
 
-    enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
+    QString getSummary() const;
+    void setSummary(const QString &summary);
+    QString getBody() const;
+    void setBody(const QString &body);
+    int getID() const;
+    void setID(const int id);
+    int getValue() const;
+    void setValue(int value);
+    QString getIcon() const;
+    void setIcon(const QString &icon);
+    QString getSecondaryIcon() const;
+    void setSecondaryIcon(const QString &secondaryIcon);
+    Type getType() const;
+    void setType(Type type);
+    ActionModel* getActions() const;
+    void setActions(const QStringList &actions);
+    QVariantMap getHints() const;
+    void setHints(const QVariantMap& hints);
+
+    Q_INVOKABLE void invokeAction(const QString &action);
+    Q_INVOKABLE void close();
 };
 
-#endif // MOCK_NOTIFICATION_TYPES_H
+#endif // MOCK_NOTIFICATION_H
 
=== added file 'tests/mocks/Unity/Notifications/MockNotificationModel.cpp'
--- tests/mocks/Unity/Notifications/MockNotificationModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationModel.cpp	2015-02-16 22:20:44 +0000
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2015 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 "MockNotificationModel.h"
+#include "MockNotification.h"
+
+#include <unity/shell/notifications/ModelInterface.h>
+
+#include <QTimer>
+#include <QList>
+#include <QVector>
+#include <QMap>
+#include <QStringListModel>
+#include <QQmlEngine>
+
+using namespace unity::shell::notifications;
+
+MockNotificationModel::MockNotificationModel(QObject *parent) : QAbstractListModel(parent) {
+}
+
+MockNotificationModel::~MockNotificationModel() {
+}
+
+int MockNotificationModel::rowCount(const QModelIndex &parent) const {
+    return m_queue.size();
+}
+
+int MockNotificationModel::getCount() const {
+    return m_queue.size();
+}
+
+QVariant MockNotificationModel::data(const QModelIndex &index, int role) const {
+    if (!index.isValid())
+            return QVariant();
+
+    switch(role) {
+        case ModelInterface::RoleType:
+            return QVariant(m_queue[index.row()]->getType());
+
+        case ModelInterface::RoleId:
+            return QVariant(m_queue[index.row()]->getID());
+
+        case ModelInterface::RoleSummary:
+            return QVariant(m_queue[index.row()]->getSummary());
+
+        case ModelInterface::RoleBody:
+            return QVariant(m_queue[index.row()]->getBody());
+
+        case ModelInterface::RoleValue:
+            return QVariant(m_queue[index.row()]->getValue());
+
+        case ModelInterface::RoleIcon:
+            return QVariant(m_queue[index.row()]->getIcon());
+
+        case ModelInterface::RoleSecondaryIcon:
+            return QVariant(m_queue[index.row()]->getSecondaryIcon());
+
+        case ModelInterface::RoleActions:
+            return QVariant::fromValue(m_queue[index.row()]->getActions());
+
+        case ModelInterface::RoleHints:
+            return QVariant(m_queue[index.row()]->getHints());
+
+        case ModelInterface::RoleNotification:
+            return QVariant::fromValue(m_queue[index.row()]);
+
+        default:
+            return QVariant();
+    }
+}
+
+void MockNotificationModel::append(MockNotification* n) {
+    int location = m_queue.size();
+    QModelIndex insertionPoint = QModelIndex();
+    beginInsertRows(insertionPoint, location, location);
+    m_queue.insert(location, n);
+    endInsertRows();
+}
+
+MockNotification* MockNotificationModel::getNotification(int id) const {
+    for(int i=0; i < m_queue.size(); i++) {
+        if(m_queue[i]->getID() == id) {
+            return m_queue[i];
+        }
+    }
+
+    return nullptr;
+}
+
+void MockNotificationModel::remove(const int id) {
+    for(int i = 0; i < m_queue.size(); i++) {
+        if(m_queue[i]->getID() == id) {
+            removeInternal(i);
+            return;
+        }
+    }
+}
+
+void MockNotificationModel::removeSecond() {
+    if(m_queue.size() < 2)
+        return;
+    removeInternal(1);
+}
+
+void MockNotificationModel::removeInternal(int loc) {
+    QModelIndex deletePoint = QModelIndex();
+    beginRemoveRows(deletePoint, loc, loc);
+    m_queue.erase(m_queue.begin() + loc);
+    endRemoveRows();
+}
+
+MockNotification* MockNotificationModel::getRaw(const int notificationId) const {
+    for(int i = 0; i < m_queue.size(); i++) {
+        if(m_queue[i]->getID() == notificationId) {
+            MockNotification* n = m_queue[i];
+            return n;
+        }
+    }
+
+    return nullptr;
+}
+
+int MockNotificationModel::queued() const {
+    return m_queue.size();
+}
+
+QHash<int, QByteArray> MockNotificationModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+
+    roles.insert(ModelInterface::RoleType, "type");
+    roles.insert(ModelInterface::RoleUrgency, "urgency");
+    roles.insert(ModelInterface::RoleId, "id");
+    roles.insert(ModelInterface::RoleSummary, "summary");
+    roles.insert(ModelInterface::RoleBody, "body");
+    roles.insert(ModelInterface::RoleValue, "value");
+    roles.insert(ModelInterface::RoleIcon, "icon");
+    roles.insert(ModelInterface::RoleSecondaryIcon, "secondaryIcon");
+    roles.insert(ModelInterface::RoleActions, "actions");
+    roles.insert(ModelInterface::RoleHints, "hints");
+    roles.insert(ModelInterface::RoleNotification, "notification");
+
+    return roles;
+}
+
+void MockNotificationModel::onCompleted(int id) {
+    remove(id);
+}
+
+void MockNotificationModel::onDataChanged(int id) {
+    for(int i = 0; i < m_queue.size(); i++) {
+        if(m_queue[i]->getID() == id) {
+            Q_EMIT dataChanged(index(i, 0), index(i, 0));
+            break;
+        }
+    }
+}
 
=== added file 'tests/mocks/Unity/Notifications/MockNotificationModel.h'
--- tests/mocks/Unity/Notifications/MockNotificationModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationModel.h	2015-02-16 22:20:44 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015 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_MODEL_H
+#define MOCK_NOTIFICATION_MODEL_H
+
+#include <QAbstractListModel>
+#include <QSharedPointer>
+#include <QScopedPointer>
+#include "MockNotification.h"
+
+class MockNotification;
+
+class MockNotificationModel : public QAbstractListModel {
+    Q_OBJECT
+    Q_PROPERTY(int count READ getCount)
+
+public:
+    MockNotificationModel(QObject *parent=nullptr);
+    virtual ~MockNotificationModel();
+
+    virtual int rowCount(const QModelIndex &parent) const;
+    virtual QVariant data(const QModelIndex &index, int role) const;
+    virtual QHash<int, QByteArray> roleNames() const;
+
+    Q_INVOKABLE void append(MockNotification* n);
+    MockNotification* getNotification(int id) const;
+
+    // getRaw() is only meant to be used from QML, since QML cannot handle
+    // QSharedPointers... on C++-side only use getNotification()
+    Q_INVOKABLE MockNotification* getRaw(const int notificationId) const;
+
+    Q_INVOKABLE int queued() const;
+    Q_INVOKABLE void remove(const int id);
+    Q_INVOKABLE void removeSecond();
+
+    int getCount() const;
+
+Q_SIGNALS:
+    void actionInvoked(const QString &action);
+
+public Q_SLOTS:
+    void onCompleted(int id);
+
+private Q_SLOTS:
+    void onDataChanged(int id);
+
+Q_SIGNALS:
+    void queueSizeChanged(int newSize);
+
+private:
+    QList<MockNotification*> m_queue;
+    void removeInternal(int loc);
+};
+
+#endif
 
=== modified file 'tests/mocks/Unity/Notifications/plugin.cpp'
--- tests/mocks/Unity/Notifications/plugin.cpp	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/plugin.cpp	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -19,13 +19,15 @@
 
 #include "plugin.h"
 #include "MockActionModel.h"
-#include "MockNotificationTypes.h"
+#include "MockNotification.h"
+#include "MockNotificationModel.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<MockNotification>(uri, 1, 0, "Notification");
+    qmlRegisterType<MockNotificationModel>(uri, 1, 0, "NotificationModel");
     qmlRegisterType<ActionModel>(uri, 1, 0, "ActionModel");
 }
 
=== modified file 'tests/mocks/Unity/Notifications/plugin.h'
--- tests/mocks/Unity/Notifications/plugin.h	2014-11-05 00:17:50 +0000
+++ tests/mocks/Unity/Notifications/plugin.h	2015-02-16 22:20:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -17,7 +17,6 @@
  *      Mirco Mueller <[e-mail]>
  */
 
-
 #ifndef TESTNOTIFICATION_PLUGIN_H
 #define TESTNOTIFICATION_PLUGIN_H
 
 
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-01-14 10:17:12 +0000
+++ tests/qmltests/CMakeLists.txt	2015-02-16 22:20:44 +0000
@@ -13,6 +13,7 @@
 set(qmltest_DEFAULT_NO_ADD_TEST FALSE)
 set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 add_qml_test(utils/Unity/Test UnityTest)
+add_qml_test(Components PhysicalKeysMapper)
 
 set(qmltest_DEFAULT_TARGETS qmluitests)
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 
=== added file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
--- tests/qmltests/Components/tst_PhysicalKeysMapper.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2015-02-16 22:20:44 +0000
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2014-2015 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 "../../../qml/Components"
+
+TestCase {
+    name: "PhysicalKeysMapper"
+
+    Loader {
+        // Using a Loader here to make sure mapper state is coherent
+        // regardless of unmatched KeyPress and KeyRelease events
+        id: loader
+        active: false
+        sourceComponent: PhysicalKeysMapper { }
+    }
+
+    SignalSpy {
+        id: powerSpy
+        target: loader.item
+        signalName: "powerKeyLongPressed"
+    }
+
+    SignalSpy {
+        id: volumeDownSpy
+        target: loader.item
+        signalName: "volumeDownTriggered"
+    }
+
+    SignalSpy {
+        id: volumeUpSpy
+        target: loader.item
+        signalName: "volumeUpTriggered"
+    }
+
+    SignalSpy {
+        id: screenshotSpy
+        target: loader.item
+        signalName: "screenshotTriggered"
+    }
+
+    function init() {
+        loader.active = true;
+        tryCompare(loader.status == Loader.Ready);
+    }
+
+    function cleanup() {
+        loader.active = false;
+        powerSpy.clear();
+        volumeDownSpy.clear();
+        volumeUpSpy.clear();
+        screenshotSpy.clear();
+    }
+
+    function test_LongPressPowerButton() {
+        loader.item.onKeyPressed({ key: Qt.Key_PowerDown });
+
+        expectFailContinue("", "Power signal should not be emitted within a second");
+        powerSpy.wait(1000);
+        powerSpy.clear();
+
+        loader.item.onKeyPressed({ key: Qt.Key_PowerDown, isAutoRepeat: true });
+        powerSpy.wait(1500);
+    }
+
+    function test_ScreenshotButtons_data() {
+        return [
+            { tag: "UpFirst", first: Qt.Key_VolumeUp, second: Qt.Key_VolumeDown },
+            { tag: "DownFirst", first: Qt.Key_VolumeDown, second: Qt.Key_VolumeUp },
+        ];
+    }
+
+    function test_ScreenshotButtons(data) {
+        loader.item.onKeyPressed({ key: data.first });
+        loader.item.onKeyPressed({ key: data.second });
+        screenshotSpy.wait();
+        loader.item.onKeyReleased({ key: data.first });
+        loader.item.onKeyReleased({ key: data.second });
+        expectFailContinue("", "VolumeUp signal should not fire");
+        volumeUpSpy.wait(100);
+        expectFailContinue("", "VolumeDown signal should not fire");
+        volumeDownSpy.wait(100);
+    }
+
+    function test_VolumeButton_data() {
+        return [
+            { tag: "Down", key: Qt.Key_VolumeDown, spy: volumeDownSpy },
+            { tag: "Up", key: Qt.Key_VolumeUp, spy: volumeUpSpy },
+        ];
+    }
+
+    function test_VolumeButton(data) {
+        loader.item.onKeyPressed({ key: data.key });
+        expectFailContinue("", "Signal should not fire on press");
+        data.spy.wait(100);
+        data.spy.clear();
+
+        loader.item.onKeyReleased({ key: data.key });
+        data.spy.wait();
+
+        loader.item.onKeyPressed({ key: data.key });
+        loader.item.onKeyPressed({ key: data.key, isAutoRepeat: true });
+        data.spy.wait();
+    }
+}
 
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2015-01-08 12:51:33 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-02-16 22:20:44 +0000
@@ -60,8 +60,8 @@
             "layout": { "components": Helpers.update(JSON.parse(Helpers.fullMapping), { "art": { "aspect-ratio": 0.7 } }) }
         },
         {
-            "name": "Art, header, summary - horizontal",
-            "layout": { "template": { "card-layout": "horizontal" },
+            "name": "Art, header, summary, background - horizontal",
+            "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
                         "components": JSON.parse(Helpers.fullMapping) }
         },
         {
@@ -101,6 +101,11 @@
             "layout": { "template": { "overlay": true },
                         "components": { "art": "art", "title": "title" } }
         },
+        {
+            "name": "Art, header, summary - horizontal",
+            "layout": { "template": { "card-layout": "horizontal" },
+                        "components": JSON.parse(Helpers.fullMapping) }
+        },
     ]
 
     CardTool {
@@ -407,7 +412,7 @@
             return [
                 { tag: "Art and summary", visible: true, color: "#ffffff", index: 0 },
                 { tag: "No Summary", visible: false, index: 6 },
-                { tag: "Horizontal", visible: false, index: 5 },
+                { tag: "Horizontal", visible: true, color: "#808080", index: 5 },
                 { tag: "Grey background", visible: true, color: "#808080", index: 10 },
                 { tag: "Overriden Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff",
                   background: {type: "color", elements: ["grey", "white"]}, index: 10 },
@@ -415,6 +420,7 @@
                   background: Qt.resolvedUrl("artwork/checkers.png"), index: 10 },
                 { tag: "Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff", index: 11 },
                 { tag: "Image background", visible: true, image: Qt.resolvedUrl("artwork/checkers.png"), index: 12 },
+                { tag: "Horizontal no background", visible: false, index: 14 },
             ];
         }
 
 
=== added file 'tests/qmltests/Notifications/Notification.qml'
--- tests/qmltests/Notifications/Notification.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Notifications/Notification.qml	2015-02-16 22:20:44 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 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]>
+ */
+
+import Unity.Notifications 1.0
+
+Notification {
+    nid: 0
+    type: Notification.PlaceHolder
+    summary: ""
+    body: ""
+    icon: ""
+    secondaryIcon: ""
+    value: 0
+    rawActions: []
+}
 
=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2014-11-10 09:14:30 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2015-02-16 22:20:44 +0000
@@ -1,17 +1,20 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright 2015 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
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
  */
 
 import QtQuick 2.0
@@ -24,146 +27,134 @@
 import QtMultimedia 5.0
 
 Item {
+    id: foobar
+
     width: notificationsRect.width + interactiveControls.width
     height: notificationsRect.height
+    property int index: 0
 
     Row {
         id: rootRow
 
-        Component {
-            id: mockNotification
-
-            QtObject {
-                function invokeAction(actionId) {
-                    mockModel.actionInvoked(actionId)
-                }
-            }
-        }
-
-        ListModel {
+        NotificationModel {
             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: []
-                }
-
+                var component = Qt.createComponent("Notification.qml")
+                var n = component.createObject("notification", {"nid": index++,
+                                                                "type": Notification.PlaceHolder,
+                                                                "hints": {},
+                                                                "summary": "",
+                                                                "body": "",
+                                                                "icon": "",
+                                                                "secondaryIcon": "",
+                                                                "rawActions": []})
+                n.completed.connect(mockModel.onCompleted)
                 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"}]
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "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": "",
+                                                            "rawActions": ["ok_id",     "Ok",
+                                                                           "snooze_id", "Snooze",
+                                                                           "view_id",   "View"]})
+            n.completed.connect(mockModel.onCompleted)
             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: []
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "type": Notification.Ephemeral,
+                                                            "hints": {},
+                                                            "summary": "Cole Raby",
+                                                            "body": "I did not expect it to be that late.",
+                                                            "icon": "../graphics/avatars/amanda.png",
+                                                            "secondaryIcon": "../graphics/applicationIcons/facebook.png",
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             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: []
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "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": "",
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             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: []
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "type": Notification.Ephemeral,
+                                                            "hints": {"x-canonical-non-shaped-icon": "false"},
+                                                            "summary": "Photo upload completed",
+                                                            "body": "",
+                                                            "icon": "../graphics/applicationIcons/facebook.png",
+                                                            "secondaryIcon": "",
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             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"}],
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "type": Notification.Interactive,
+                                                            "hints": {},
+                                                            "summary": "Interactive notification",
+                                                            "body": "This is a notification that can be clicked",
+                                                            "icon": "../graphics/avatars/anna_olsson.png",
+                                                            "secondaryIcon": "",
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             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: [],
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "type": Notification.Confirmation,
+                                                            "hints": {"x-canonical-non-shaped-icon": "true"},
+                                                            "summary": "Confirmation notification",
+                                                            "body": "",
+                                                            "icon": "image://theme/audio-volume-medium",
+                                                            "secondaryIcon": "",
+                                                            "value": 50,
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             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: [],
-            }
-
+            var component = Qt.createComponent("Notification.qml")
+            var n = component.createObject("notification", {"nid": index++,
+                                                            "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,
+                                                            "rawActions": ["reply_id", "Dummy"]})
+            n.completed.connect(mockModel.onCompleted)
             mockModel.append(n)
         }
 
@@ -174,8 +165,9 @@
         }
 
         function remove1stNotification() {
-            if (mockModel.count > 1)
-                mockModel.remove(1)
+            if (mockModel.count > 1) {
+                mockModel.removeSecond()
+            }
         }
 
         Rectangle {
@@ -273,41 +265,122 @@
             name: "NotificationRendererTest"
             when: windowShown
 
+            property list<Notification> nlist: [
+                Notification {
+                    nid: 1
+                    type: Notification.Ephemeral
+                    summary: "Photo upload completed"
+                    body: ""
+                    icon: "../graphics/applicationIcons/facebook.png"
+                    secondaryIcon: ""
+                    value: 0
+                    rawActions: []
+                },
+                Notification {
+                    nid: 2
+                    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"
+                    value: 0
+                    rawActions: []
+                },
+                Notification {
+                    nid: 3
+                    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: ""
+                    value: 0
+                    rawActions: ["reply_id", "Dummy"]
+                },
+                Notification {
+                    nid: 4
+                    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: ""
+                    value: 0
+                    rawActions: ["accept_id", "Accept",
+                                 "reject_id", "Reject"]
+                },
+                Notification {
+                    nid: 5
+                    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"
+                    value: 0
+                    rawActions: []
+                },
+                Notification {
+                    nid: 6
+                    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: ""
+                    value: 0
+                    rawActions: []
+                },
+                Notification {
+                    nid: 7
+                    type: Notification.Confirmation
+                    hints: {"x-canonical-non-shaped-icon": "true"}
+                    summary: ""
+                    body: ""
+                    icon: "image://theme/audio-volume-medium"
+                    secondaryIcon: ""
+                    value: 50
+                    rawActions: []
+                },
+                Notification {
+                    nid: 8
+                    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
+                    rawActions: []
+                },
+                Notification {
+                    nid: 9
+                    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: ""
+                    value: 0
+                    rawActions: ["ok_id",     "Ok",
+                                 "snooze_id", "Snooze",
+                                 "view_id",   "View"]
+                }
+            ]
+
             function test_NotificationRenderer_data() {
                 return [
                 {
-                    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: [],
+                    n: nlist[0],
                     summaryVisible: true,
                     bodyVisible: false,
                     iconVisible: true,
@@ -323,15 +396,7 @@
                 },
                 {
                     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: [],
+                    n: nlist[1],
                     summaryVisible: true,
                     bodyVisible: false,
                     interactiveAreaEnabled: false,
@@ -348,14 +413,7 @@
                 },
                 {
                     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"}],
+                    n: nlist[2],
                     summaryVisible: true,
                     bodyVisible: true,
                     iconVisible: true,
@@ -371,15 +429,7 @@
                 },
                 {
                     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"}],
+                    n: nlist[3],
                     summaryVisible: true,
                     bodyVisible: true,
                     iconVisible: true,
@@ -395,14 +445,7 @@
                 },
                 {
                     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: [],
+                    n: nlist[4],
                     summaryVisible: true,
                     bodyVisible: true,
                     iconVisible: true,
@@ -418,14 +461,7 @@
                 },
                 {
                     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: [],
+                    n: nlist[5],
                     summaryVisible: true,
                     bodyVisible: true,
                     iconVisible: true,
@@ -441,14 +477,7 @@
                 },
                 {
                     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: [],
+                    n: nlist[6],
                     summaryVisible: false,
                     bodyVisible: false,
                     iconVisible: false,
@@ -464,15 +493,7 @@
                 },
                 {
                     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: [],
+                    n: nlist[7],
                     summaryVisible: false,
                     bodyVisible: false,
                     iconVisible: false,
@@ -485,6 +506,22 @@
                     valueVisible: true,
                     valueLabelVisible: true,
                     valueTinted: true
+                },
+                {
+                    tag: "2-over-1 Snap Decision with button-tint",
+                    n: nlist[8],
+                    summaryVisible: true,
+                    bodyVisible: true,
+                    iconVisible: false,
+                    centeredIconVisible: false,
+                    shaped: false,
+                    secondaryIconVisible: false,
+                    buttonRowVisible: false,
+                    buttonTinted: true,
+                    hasSound: false,
+                    valueVisible: false,
+                    valueLabelVisible: false,
+                    valueTinted: false
                 }
                 ]
             }
@@ -509,8 +546,14 @@
             }
 
             function test_NotificationRenderer(data) {
+                // make sure the clicks on mocked notifications can be checked against by "actionSpy" (mimicking the NotificationServer component)
+                data.n.actionInvoked.connect(mockModel.actionInvoked)
+
+                // hook up notification's completed-signal with model's onCompleted-slot, so that remove() (model) happens on close() (notification)
+                data.n.completed.connect(mockModel.onCompleted)
+
                 // populate model with some mock notifications
-                mockModel.append(data)
+                mockModel.append(data.n)
 
                 // make sure the view is properly updated before going on
                 notifications.forceLayout();
@@ -548,9 +591,9 @@
 
                 // test input does not fall through
                 mouseClick(notification, notification.width / 2, notification.height / 2)
-                if(data.type == Notification.Interactive) {
+                if(data.n.type === Notification.Interactive) {
                     actionSpy.wait()
-                    compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
+                    compare(actionSpy.signalArguments[0][0], data.n.actions.data(0, ActionModel.RoleActionId), "got wrong id for interactive action")
                 }
                 compare(clickThroughSpy.count, 0, "click on notification fell through")
 
@@ -559,17 +602,19 @@
                 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.hasSound) {
+                    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) {
+                    if (data.n.actions.count === 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")
+                        compare(actionSpy.signalArguments[0][0], data.n.actions.data(1, ActionModel.RoleActionId), "got wrong id for negative action")
                         actionSpy.clear()
                     }
 
@@ -578,36 +623,49 @@
 
                     // 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")
+                    compare(actionSpy.signalArguments[0][0], data.n.actions.data(0, ActionModel.RoleActionId), "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) {
+                    if (data.n.actions.count > 3) {
                         var comboButton = findChild(notification, "notify_button2")
-                        tryCompareFunction(function() { return comboButton.expanded == false; }, true);
+                        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);
+                        tryCompareFunction(function() { mouseClick(comboButton, comboButton.width / 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")
+                        compare(actionSpy.signalArguments[0][0], data.n.actions.data(3, ActionModel.RoleActionId), "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")
+                        compare(actionSpy.signalArguments[0][0], data.n.actions.data(4, ActionModel.RoleActionId), "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);
+                        tryCompareFunction(function() { mouseClick(comboButton, comboButton.width / 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")
+                        compare(actionSpy.signalArguments[0][0], data.n.actions.data(1, ActionModel.RoleActionId), "got wrong id for negative action")
                     }
                 }
+
+                // swipe-to-dismiss check
+                waitForRendering(notification)
+                var before = mockModel.count
+                var dragStart = notification.width * 0.25;
+                var dragEnd = notification.width;
+                var dragY = notification.height / 2;
+                touchFlick(notification, dragStart, dragY, dragEnd, dragY)
+                waitForRendering(notification)
+                if ((data.n.type === Notification.SnapDecision && notification.state === "expanded") || data.n.type === Notification.Confirmation) {
+                    tryCompare(mockModel, "count", before)
+                } else {
+                    tryCompare(mockModel, "count", before - 1)
+                }
             }
         }
     }
 
=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
--- tests/qmltests/Notifications/tst_OptionToggle.qml	2014-11-10 09:14:30 +0000
+++ tests/qmltests/Notifications/tst_OptionToggle.qml	2015-02-16 22:20:44 +0000
@@ -1,17 +1,20 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright 2015 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
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
  */
 
 import QtQuick 2.0
@@ -235,8 +238,10 @@
             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.hasSound) {
+                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")
 
=== modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	2014-11-05 14:37:11 +0000
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-02-16 22:20:44 +0000
@@ -218,6 +218,10 @@
                 // populate model with some mock notifications
                 mockModel.append(data)
 
+                // add actions to action-model to test against
+                myActionModel.append("ok_id", "Ok")
+                myActionModel.append("cancel_id", "Cancel")
+
                 // make sure the view is properly updated before going on
                 notifications.forceLayout();
                 waitForRendering(notifications);
 
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2014-12-05 16:27:27 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2015-02-16 22:20:44 +0000
@@ -472,5 +472,52 @@
 
         }
 
+        /*
+            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1393447
+
+            Do a left edge drag that is long enough to start displacing the greeter
+            but short engough so that the greeter comes back into place once the
+            finger is lifted.
+
+            In this situation the launcher should remaing fully shown and hide itself
+            only after its idle timeout is triggered.
+         */
+        function test_shortLeftEdgeSwipeMakesLauncherStayVisible() {
+            var greeter = testCase.findChild(shell, "greeter")
+            greeter.show();
+            tryCompare(greeter, "showProgress", 1);
+
+            var launcher = testCase.findChild(shell, "launcher")
+            {
+                var dismissTimer = testCase.findInvisibleChild(launcher, "dismissTimer");
+                // effectively disable the dismiss timer
+                dismissTimer.interval = 24 * 60 * 60 * 1000 // 24 hours
+            }
+            var launcherPanel = testCase.findChild(launcher, "launcherPanel");
+
+            var toX = shell.width * 0.45;
+            touchFlick(shell,
+                    1 /* fromX */, shell.height * 0.5 /* fromY */,
+                    toX /* toX */, shell.height * 0.5 /* toY */,
+                    true /* beginTouch */, false /* endTouch */,
+                    50, 100);
+
+            // Launcher must be fully shown by now
+            tryCompare(launcherPanel, "x", 0);
+
+            // Greeter should be displaced
+            tryCompareFunction(function() { return greeter.mapToItem(shell, 0, 0).x > shell.width*0.2; }, true);
+
+            touchRelease(shell, toX, shell.height * 0.5);
+
+            // Upon release the greeter should have slid back into full view
+            tryCompareFunction(function() { return greeter.mapToItem(shell, 0, 0).x === 0; }, true);
+
+            // And the launcher should stay fully shown
+            for (var i = 0; i < 10; ++i) {
+                wait(50);
+                compare(launcherPanel.x, 0);
+            }
+        }
     }
 }