Merge lp:~unity-team/unity8/fix_ticket_1105_tests into lp:unity8

[Albert Astals Cid]

Fix various tests

test_navigationShowFilterButton is gone since it was testing a feature that no longer exists

 * Are there any related MPs required for this MP to build/function as expected
Prereq

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

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

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2296
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/745/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/982
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/998
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/998
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/996/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/996/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/996/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/996/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/996/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/996/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/745/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/fix_ticket_1105_tests]

2279. By Lukáš Tinkl on 2016-03-15

merge lp:~aacid/unity8/listitemworkaround

2280. By Albert Astals Cid on 2016-03-15

Fix some ticket 1105 test failures

2281. By Albert Astals Cid on 2016-03-16

Another small test fix

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-03-10 22:42:34 +0000
+++ debian/control	2016-03-15 19:17:30 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.107),
+               libunity-api-dev (>= 7.108),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!armhf],
@@ -133,7 +133,7 @@
          unity-application-impl-13,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
-         unity-scopes-impl-10,
+         unity-scopes-impl-11,
          unity8-fake-env | unity-application-impl,
          ${misc:Depends},
 Breaks: unity8 (<< 7.86),

=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2015-07-15 15:07:19 +0000
+++ plugins/Dash/ScopeStyle.qml	2016-03-15 19:17:30 +0000
@@ -58,7 +58,7 @@
     readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
 
     /// Background style for the header
-    readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#f5f5f5"
+    readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
 
     /// Foreground color for the header
     readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-08-03 13:48:14 +0000
+++ qml/Dash/DashContent.qml	2016-03-15 19:17:30 +0000
@@ -108,7 +108,7 @@
             objectName: "dashContentList"
 
             interactive: !dashContent.forceNonInteractive && dashContent.scopes.loaded && currentItem
-                      && !currentItem.moving && !currentItem.navigationDisableParentInteractive && !currentItem.subPageShown
+                         && !currentItem.moving && !currentItem.subPageShown && !currentItem.extraPanelShown
             anchors.fill: parent
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
@@ -170,7 +170,7 @@
                     objectName: "scopeLoader" + index
 
                     readonly property bool moving: item ? item.moving : false
-                    readonly property bool navigationDisableParentInteractive: item ? item.navigationDisableParentInteractive : false
+                    readonly property bool extraPanelShown: item ? item.extraPanelShown : false
                     readonly property bool subPageShown: item ? item.subPageShown : false
                     readonly property var categoryView: item ? item.categoryView : null
                     readonly property var theScope: scope

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2015-07-15 15:07:19 +0000
+++ qml/Dash/DashNavigation.qml	2016-03-15 19:17:30 +0000
@@ -17,101 +17,182 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Dash 0.1
-import "../Components"
 
 Item {
     id: root
     objectName: "dashNavigation"
 
+    // set by parent
     property var scope: null
-    property var scopeStyle: null
-
-    property alias windowWidth: blackRect.width
-    property alias windowHeight: blackRect.height
-    readonly property var openList: {
-        if (navigationButton.showList) return navigationButton.listView;
-        if (altNavigationButton.showList) return altNavigationButton.listView;
-        return null;
-    }
-    readonly property bool disableParentInteractive: {
-        return navigationButton.showList || altNavigationButton.showList ||
-               navigationButton.inverseMousePressed || altNavigationButton.inverseMousePressed;
-    }
-
-    // FIXME this is only here for highlight purposes (see Background.qml, too)
-    readonly property var background: backgroundItem
+    property real availableHeight
+
+    signal leafClicked()
+
+    // internal
+    readonly property var currentNavigation: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
+    // Are we drilling down the tree or up?
+    property bool isEnteringChildren: false
 
     visible: height != 0
-    height: navigationButton.currentNavigation || altNavigationButton.currentNavigation ? units.gu(5) : 0
-
-    QtObject {
-        id: d
-        readonly property color foregroundColor: root.scopeStyle
-                                                 ? root.scopeStyle.getTextColor(backgroundItem.luminance)
-                                                 : theme.palette.normal.baseText
-        readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
-        readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
-        readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
-    }
-
-    Rectangle {
-        id: blackRect
-        objectName: "blackRect"
-        color: "black"
-        opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0
-        Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-        anchors { left: parent.left; right: parent.right }
-        visible: opacity > 0
-    }
-
-    Background {
-        id: backgroundItem
-        anchors.fill: parent
-        style: scopeStyle ? scopeStyle.navigationBackground : "color:///#f5f5f5"
-    }
-
-    Image {
-        fillMode: Image.Stretch
-        source: scopeStyle.backgroundLuminance > 0.2 ? "graphics/navigation_shadow.png" : "graphics/navigation_shadow_light.png"
-        anchors { top: parent.bottom; left: parent.left; right: parent.right }
-    }
-
-    DashNavigationButton {
-        id: altNavigationButton
-        objectName: "altNavigationButton"
-        height: root.height
-        width: d.buttonWidth
-        scope: root.scope
-        scopeStyle: root.scopeStyle
-        foregroundColor: d.foregroundColor
-        listView.width: d.navigationWidth
-        isAltNavigation: true
-        showDivider: navigationButton.visible || root.width > d.navigationWidth
-        // needed so that InverseMouseArea is above navigationButton
-        z: listView.height > 0 ? 1 : 0
-    }
-
-    DashNavigationButton {
-        id: navigationButton
-        objectName: "navigationButton"
-        height: root.height
-        width: altNavigationButton.visible ? d.buttonWidth : d.navigationWidth
-        x: altNavigationButton.visible ? d.buttonWidth : 0
-        scope: root.scope
-        scopeStyle: root.scopeStyle
-        foregroundColor: d.foregroundColor
-        listView.width: d.navigationWidth
-        listView.x: -x
-        showDivider: root.width > d.navigationWidth
-    }
-
-    Image {
-        fillMode: Image.Stretch
-        source: backgroundItem.luminance > 0.7 ? "graphics/navigation_shadow.png" : "graphics/navigation_shadow_light.png"
-        x: navigationButton.listView.height > 0 ? altNavigationButton.x : navigationButton.x
-        width: d.buttonWidth
-        rotation: 180
-        anchors.bottom: parent.bottom
-        visible: d.bothVisible && (navigationButton.listView.height > 0 || altNavigationButton.listView.height > 0)
-    }
+    implicitHeight: scope && scope.hasNavigation ? navigationListView.y + navigationListView.height : 0
+
+    function resetNavigation() {
+        if (navigationModel.count > 1) {
+            clear();
+        }
+    }
+
+    Column {
+        id: headersColumn
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+
+        function pop(popsNeeded) {
+            if (popsNeeded == 0)
+                return;
+            isEnteringChildren = false;
+            navigationListView.currentIndex = navigationListView.currentIndex - popsNeeded;
+            navigationModel.setProperty(navigationListView.currentIndex, "nullifyNavigation", false);
+            navigationModel.remove(navigationModel.count - popsNeeded, popsNeeded);
+
+            popsNeeded = Math.min(headersModel.count, popsNeeded);
+            // This is effectively deleting ourselves, so needs to be the last thing of the function
+            headersModel.remove(headersModel.count - popsNeeded, popsNeeded);
+        }
+
+        Repeater {
+            model: ListModel {
+                id: headersModel
+                // Roles
+                // headerText: the text to show
+                // navigationId: the navigation Id that represents
+                // parentNavigationId: the parent navigation Id
+            }
+            delegate: DashNavigationHeader {
+                objectName: "dashNavigationHeader" + index
+                height: index == 0 && headersModel.count > 1 ? 0 : units.gu(5)
+                width: headersColumn.width
+
+                backVisible: index != 0
+                text: headerText
+
+                onBackClicked: {
+                    scope.setNavigationState(parentNavigationId);
+
+                    var popsNeeded = headersModel.count - index;
+                    headersColumn.pop(popsNeeded);
+                }
+
+                onTextClicked: {
+                    scope.setNavigationState(navigationId);
+
+                    var popsNeeded = headersModel.count - index - 1;
+                    headersColumn.pop(popsNeeded);
+
+                    root.leafClicked();
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: navigationListView
+        objectName: "navigationListView"
+        orientation: ListView.Horizontal
+        interactive: false
+        model: ListModel {
+            id: navigationModel
+            // We have two roles
+            // navigationId: the navigation id of the navigation the list represents
+            // nullifyNavigation: overrides navigationId to be null
+            //                    This is used to "clear" the delegate when going "right" on the tree
+        }
+        anchors {
+            top: headersColumn.bottom
+            left: parent.left
+            right: parent.right
+        }
+        readonly property int maxHeight: root.availableHeight - navigationListView.y
+        property int prevHeight: maxHeight
+        height: currentItem ? currentItem.height : maxHeight
+
+        onHeightChanged: {
+            if (currentItem) {
+                prevHeight = currentItem.desiredHeight;
+            }
+        }
+        highlightMoveDuration: UbuntuAnimation.FastDuration
+        delegate: DashNavigationList {
+            objectName: "navigation" + index
+            visible: height > 0
+            width: navigationListView.width
+            property real desiredHeight: {
+                if (navigation && navigation.loaded && x == navigationListView.contentX)
+                {
+                    return Math.min(implicitHeight, navigationListView.maxHeight);
+                } else {
+                    return navigationListView.prevHeight;
+                }
+            }
+            height: desiredHeight
+            navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
+            currentNavigation: root.currentNavigation
+            onEnterNavigation: { // var newNavigationId, string newNavigationLabel, bool hasChildren
+                scope.setNavigationState(newNavigationId);
+                // We only need to add a new item to the model
+                // if we have children, otherwise just load it
+                if (hasChildren) {
+                    isEnteringChildren = true;
+                    navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
+                    headersModel.append({"headerText": newNavigationLabel,
+                                         "navigationId": newNavigationId,
+                                         "parentNavigationId": navigationId
+                                        });
+                    navigationListView.currentIndex++;
+                } else {
+                    root.leafClicked();
+                }
+            }
+        }
+        onContentXChanged: {
+            if (navigationListView.highlightMoveDuration == 0)
+                return;
+
+            if (contentX == width * navigationListView.currentIndex) {
+                if (isEnteringChildren) {
+                    navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);
+                }
+            }
+        }
+    }
+
+    property bool isFirstLoad: false
+    onScopeChanged: clear();
+    function clear() {
+        navigationModel.clear();
+        headersModel.clear();
+        isFirstLoad = true;
+    }
+    function setNewNavigation() {
+        if (isFirstLoad && currentNavigation && currentNavigation.loaded) {
+            isFirstLoad = false;
+            if (currentNavigation.count > 0) {
+                navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
+            } else {
+                navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
+            }
+            headersModel.append({"headerText": currentNavigation.allLabel != "" ? currentNavigation.allLabel : currentNavigation.label,
+                                 "navigationId": currentNavigation.navigationId,
+                                 "parentNavigationId": currentNavigation.parentNavigationId
+                                });
+        }
+    }
+    Connections {
+        target: currentNavigation
+        onLoadedChanged: setNewNavigation();
+    }
+    onCurrentNavigationChanged: setNewNavigation();
 }

=== removed file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2015-07-15 15:07:19 +0000
+++ qml/Dash/DashNavigationButton.qml	1970-01-01 00:00:00 +0000
@@ -1,233 +0,0 @@
-/*
- * 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.4
-import Ubuntu.Components 1.3
-
-AbstractButton {
-    id: root
-    objectName: "dashNavigation"
-
-    // Set by parent
-    property var scope: null
-    property var scopeStyle: null
-    property color foregroundColor: theme.palette.normal.baseText
-    property bool isAltNavigation: false
-    property bool showDivider: false
-
-    // Used by parent
-    readonly property var currentNavigation: scope && scope[hasNavigation] ? getNavigation(scope[currentNavigationId]) : null
-    readonly property alias listView: navigationListView
-    readonly property bool inverseMousePressed: inverseMouseArea.pressed
-    property bool showList: false
-
-    // Internal
-    // Are we drilling down the tree or up?
-    property bool isGoingBack: false
-    readonly property string hasNavigation: isAltNavigation ? "hasAltNavigation" : "hasNavigation"
-    readonly property string currentNavigationId: isAltNavigation ? "currentAltNavigationId" : "currentNavigationId"
-    function getNavigation(navId) {
-        if (isAltNavigation) {
-            return scope.getAltNavigation(navId);
-        } else {
-            return scope.getNavigation(navId);
-        }
-    }
-
-    visible: root.currentNavigation != null
-
-    onClicked: {
-        navigationListView.updateMaxHeight();
-        root.showList = !root.showList;
-    }
-
-    Label {
-        anchors.fill: parent
-        anchors.margins: units.gu(2)
-        anchors.rightMargin: units.gu(5)
-        verticalAlignment: Text.AlignVCenter
-        text: root.currentNavigation ? root.currentNavigation.label : ""
-        color: root.foregroundColor
-        elide: Text.ElideRight
-        maximumLineCount: 1
-    }
-
-    Icon {
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: units.gu(2)
-        name: showList ? "up" : "down"
-        height: units.gu(2)
-        width: height
-        color: root.foregroundColor
-    }
-
-    //  navigationListView is outside root
-    ListView {
-        id: navigationListView
-        objectName: "navigationListView"
-        visible: height > 0
-        orientation: ListView.Horizontal
-        interactive: false
-        clip: root.width != windowWidth
-        model: ListModel {
-            id: navigationModel
-            // We have two roles
-            // navigationId: the navigation id of the navigation the list represents
-            // nullifyNavigation: overrides navigationId to be null
-            //                    This is used to "clear" the delegate when going "right" on the tree
-        }
-        anchors.top: root.bottom
-        property int maxHeight: -1
-        Component.onCompleted: updateMaxHeight();
-        function updateMaxHeight()
-        {
-            maxHeight = (windowHeight - mapToItem(null, 0, 0).y) - units.gu(8);
-        }
-        property int prevHeight: maxHeight
-        height: currentItem ? currentItem.height : maxHeight
-        onHeightChanged: {
-            if (root.showList) {
-                prevHeight = currentItem.desiredHeight;
-            }
-        }
-        highlightMoveDuration: UbuntuAnimation.FastDuration
-        delegate: DashNavigationList {
-            objectName: "navigation" + index
-            visible: height > 0
-            width: navigationListView.width
-            scopeStyle: root.scopeStyle
-            foregroundColor: root.foregroundColor
-            property real desiredHeight: {
-                if (root.showList) {
-                    if (navigation && navigation.loaded && x == navigationListView.contentX)
-                    {
-                        navigationListView.updateMaxHeight();
-                        return Math.min(implicitHeight, navigationListView.maxHeight);
-                    } else {
-                        return navigationListView.prevHeight;
-                    }
-                } else {
-                    return 0;
-                }
-            }
-            height: desiredHeight
-            navigation: (nullifyNavigation || !scope) ? null : getNavigation(navigationId)
-            currentNavigation: root.currentNavigation
-            onEnterNavigation: {
-                scope.setNavigationState(newNavigationId, isAltNavigation);
-                // We only need to add a new item to the model
-                // if we have children, otherwise just load it
-                if (hasChildren) {
-                    isGoingBack = false;
-                    navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
-                    navigationListView.currentIndex++;
-                } else {
-                    showList = false;
-                }
-            }
-            onGoBackToParentClicked: {
-                if (navigationListView.currentIndex == 0) {
-                    // This can happen if we jumped to the non root of a deep tree and the user
-                    // is now going back, create space in the list for the list to move "left"
-                    var aux = navigationListView.highlightMoveDuration;
-                    navigationListView.highlightMoveDuration = 0;
-                    navigationModel.insert(0, {"navigationId": navigation.parentNavigationId, "nullifyNavigation": false});
-                    navigationListView.currentIndex = navigationListView.currentIndex + 1;
-                    navigationListView.contentX = width * navigationListView.currentIndex;
-                    navigationListView.highlightMoveDuration = aux;
-                }
-
-                scope.setNavigationState(navigation.parentNavigationId, isAltNavigation);
-                isGoingBack = true;
-                navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
-                navigationListView.currentIndex--;
-            }
-            onAllNavigationClicked: {
-                showList = false;
-                if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
-                    // For leaves we have to go to the parent too
-                    scope.setNavigationState(root.currentNavigation.parentNavigationId, isAltNavigation);
-                }
-            }
-        }
-        onContentXChanged: {
-            if (navigationListView.highlightMoveDuration == 0)
-                return;
-
-            if (contentX == width * navigationListView.currentIndex) {
-                if (isGoingBack) {
-                    navigationModel.remove(navigationListView.currentIndex + 1);
-                } else {
-                    navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);
-                }
-            }
-        }
-    }
-
-    Image {
-        anchors {
-            top: navigationListView.bottom
-            left: navigationListView.left
-            right: navigationListView.right
-        }
-        fillMode: Image.Stretch
-        source: "graphics/navigation_shadow.png"
-        visible: root.showList
-    }
-
-    property bool isFirstLoad: false
-    onScopeChanged: {
-        navigationModel.clear();
-        isFirstLoad = true;
-    }
-    function setNewNavigation() {
-        if (isFirstLoad && currentNavigation && currentNavigation.loaded) {
-            isFirstLoad = false;
-            if (currentNavigation.count > 0) {
-                navigationModel.append({"navigationId": scope[currentNavigationId], "nullifyNavigation": false});
-            } else {
-                navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
-            }
-        }
-    }
-    Connections {
-        target: currentNavigation
-        onLoadedChanged: setNewNavigation();
-    }
-    onCurrentNavigationChanged: setNewNavigation();
-
-    InverseMouseArea {
-        id: inverseMouseArea
-        anchors.fill: navigationListView
-        enabled: root.showList
-        onPressed: root.showList = false
-    }
-
-    Rectangle {
-        visible: root.showDivider
-        anchors {
-            top: parent.top
-            topMargin: units.dp(1)
-            bottom: parent.bottom
-            left: parent.right
-            leftMargin: -units.dp(0.5)
-        }
-        width: units.dp(1)
-        color: root.foregroundColor
-        opacity: 0.2
-    }
-}

=== added file 'qml/Dash/DashNavigationHeader.qml'
--- qml/Dash/DashNavigationHeader.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/DashNavigationHeader.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Row {
+    id: root
+
+    property alias backVisible: backImageItem.visible
+    property alias textEnabled: textItem.enabled
+    property alias text: textLabel.text
+
+    readonly property alias backButtonWidth: backImageItem.width
+
+    signal backClicked()
+    signal textClicked()
+
+    ListItem.Standard {
+        id: backImageItem
+        objectName: "backButton"
+        height: parent.height
+        width: height
+        showDivider: false
+
+        Icon {
+            id: backImage
+            anchors.centerIn: parent
+            name: "back"
+            height: units.gu(2)
+            width: height
+        }
+
+        onClicked: root.backClicked();
+    }
+
+    ListItem.Standard {
+        id: textItem
+        height: parent.height
+        showDivider: false
+
+        Label {
+            id: textLabel
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+                right: parent.right
+                leftMargin: backImageItem.visible ? 0 : units.gu(2)
+                rightMargin: units.gu(2)
+            }
+            color: "#5D5D5D"
+            wrapMode: Text.Wrap
+            maximumLineCount: 2
+            elide: Text.ElideMiddle
+        }
+
+        onClicked: root.textClicked();
+    }
+}

=== modified file 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashNavigationList.qml	2015-11-19 16:55:31 +0000
+++ qml/Dash/DashNavigationList.qml	2016-03-15 19:17:30 +0000
@@ -16,27 +16,18 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItems
 import "../Components"
 
 Item {
     id: root
     property var navigation: null
     property var currentNavigation: null
-    property var scopeStyle: null
-    property color foregroundColor: theme.palette.normal.baseText
-    signal enterNavigation(var newNavigationId, bool hasChildren)
-    signal goBackToParentClicked()
-    signal allNavigationClicked()
+    signal enterNavigation(var newNavigationId, string newNavigationLabel, bool hasChildren)
 
     readonly property int itemHeight: units.gu(5)
     implicitHeight: flickable.contentHeight
 
-    Background {
-        style: root.scopeStyle ? root.scopeStyle.navigationBackground : "color:///#f5f5f5"
-        anchors.fill: parent
-    }
-
     clip: true
 
     Behavior on height {
@@ -59,89 +50,46 @@
             id: column
             width: parent.width
 
-            ListItem.Standard {
-                id: backButton
-                objectName: "backButton"
-                visible: navigation && !navigation.isRoot || false
-                height: itemHeight
-
-                onClicked: root.goBackToParentClicked();
-
-                Icon {
-                    id: backImage
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: parent.left
-                        leftMargin: units.gu(2)
-                    }
-                    name: "back"
-                    height: units.gu(2)
-                    width: height
-                    color: root.foregroundColor
-                }
-
-                Label {
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: backImage.right
-                        right: parent.right
-                        leftMargin: units.gu(0.5)
-                        rightMargin: units.gu(2)
-                    }
-                    text: navigation ? navigation.parentLabel : ""
-                    color: root.foregroundColor
-                    wrapMode: Text.Wrap
-                    maximumLineCount: 2
-                    elide: Text.ElideMiddle
-                }
-            }
-
-            ListItem.Standard {
-                id: allButton
-                objectName: "allButton"
-                visible: navigation && (!navigation.isRoot || (!navigation.hidden && root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
-                height: itemHeight
-
-                Label {
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: parent.left
-                        right: parent.right
-                        leftMargin: units.gu(2)
-                        rightMargin: units.gu(2)
-                    }
-                    text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
-                    font.bold: true
-                    color: root.foregroundColor
-                    wrapMode: Text.Wrap
-                    maximumLineCount: 2
-                    elide: Text.ElideMiddle
-                }
-
-                onClicked: root.allNavigationClicked();
-            }
-
             Repeater {
                 model: navigation && navigation.loaded ? navigation : null
                 clip: true
-                delegate: ListItem.Standard {
+                // FIXME Move to ListItem (and remove import) once 1556971 is fixed
+                delegate: ListItems.Empty {
                     objectName: root.objectName + "child" + index
                     height: root.itemHeight
-                    showDivider: index != navigation.count - 1
-                    selected: isActive
-
-                    onClicked: root.enterNavigation(navigationId, hasChildren)
+                    width: column.width
+                    anchors {
+                        left: column.left
+                        right: column.right
+                        leftMargin: units.gu(2)
+                        rightMargin: units.gu(2)
+                    }
+
+                    onClicked: root.enterNavigation(navigationId, allLabel != "" ? allLabel : label, hasChildren)
+
+                    Icon {
+                        id: leftIcon
+                        anchors {
+                            verticalCenter: parent.verticalCenter
+                            left: parent.left
+                        }
+                        height: units.gu(2)
+                        width: height
+                        name: "tick"
+                        color: "#3EB34F"
+                        visible: isActive
+                    }
 
                     Label {
                         anchors {
                             verticalCenter: parent.verticalCenter
-                            left: parent.left
-                            leftMargin: units.gu(2)
-                            right: rightIcon.visible ? rightIcon.left : parent.right
-                            rightMargin: rightIcon.visible ? units.gu(0.5) : units.gu(2)
+                            left: leftIcon.right
+                            leftMargin: units.gu(1)
+                            right: rightIcon.left
+                            rightMargin: units.gu(2)
                         }
                         text: label
-                        color: root.foregroundColor
+                        color: isActive ? "#333333" : "#888888"
                         wrapMode: Text.Wrap
                         maximumLineCount: 2
                         elide: Text.ElideMiddle
@@ -152,14 +100,14 @@
                         anchors {
                             verticalCenter: parent.verticalCenter
                             right: parent.right
-                            rightMargin: units.gu(2)
                         }
                         height: units.gu(2)
                         width: height
-                        name: hasChildren ? "go-next" : "tick"
-                        color: root.foregroundColor
-                        visible: hasChildren || isActive
+                        name: "go-next"
+                        visible: hasChildren
                     }
+
+                    divider.visible: index != navigation.count - 1
                 }
             }
         }

=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml	2016-01-25 10:48:16 +0000
+++ qml/Dash/DashPageHeader.qml	2016-03-15 19:17:30 +0000
@@ -17,41 +17,45 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes.Ambiance 1.3
-import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.ListItems 1.3
 import "../Components"
-import "../Components/SearchHistoryModel"
 
 Item {
     id: root
     objectName: "pageHeader"
-    implicitHeight: headerContainer.height + bottomContainer.height + (showSignatureLine ? units.gu(2) : 0)
+    implicitHeight: headerContainer.height + signatureLineHeight
+    readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0
 
+    property int activeFiltersCount: 0
+    property bool scopeHasFilters: false
     property bool showBackButton: false
     property bool backIsClose: false
     property string title
+    property var extraPanel
+    property string navigationTag
 
     property bool storeEntryEnabled: false
     property bool searchEntryEnabled: false
     property bool settingsEnabled: false
     property bool favoriteEnabled: false
     property bool favorite: false
-    property ListModel searchHistory: SearchHistoryModel
+    property ListModel searchHistory
     property alias searchQuery: searchTextField.text
     property alias searchHint: searchTextField.placeholderText
     property bool showSignatureLine: true
 
-    property alias bottomItem: bottomContainer.children
     property int paginationCount: 0
     property int paginationIndex: -1
 
     property var scopeStyle: null
 
+    signal clearSearch(bool keepPanelOpen)
     signal backClicked()
     signal storeClicked()
     signal settingsClicked()
     signal favoriteClicked()
     signal searchTextFieldFocused()
+    signal showFiltersPopup(var item)
 
     onScopeStyleChanged: refreshLogo()
     onSearchQueryChanged: {
@@ -60,6 +64,12 @@
             headerContainer.showSearch = true;
         }
     }
+    onNavigationTagChanged: {
+        // Make sure we are at the search page if the navigation tag changes behind our feet
+        if (navigationTag) {
+            headerContainer.showSearch = true;
+        }
+    }
 
     function triggerSearch() {
         if (searchEntryEnabled) {
@@ -69,12 +79,14 @@
     }
 
     function closePopup(keepFocus) {
-        if (headerContainer.popover != null) {
-            headerContainer.popover.unfocusOnDestruction = !keepFocus;
-            PopupUtils.close(headerContainer.popover);
+        if (extraPanel.visible) {
+            extraPanel.visible = false;
         } else if (!keepFocus) {
             unfocus();
         }
+        if (!searchTextField.text && !root.navigationTag && searchHistory.count == 0) {
+            headerContainer.showSearch = false;
+        }
     }
 
     function resetSearch(keepFocus) {
@@ -87,22 +99,17 @@
 
     function unfocus() {
         searchTextField.focus = false;
-        if (!searchTextField.text) {
+        if (!searchTextField.text && !root.navigationTag) {
             headerContainer.showSearch = false;
         }
     }
 
-    function openSearchHistory() {
+    function openPopup() {
         if (openSearchAnimation.running) {
-            openSearchAnimation.openSearchHistory = true;
-        } else if (root.searchHistory.count > 0 && headerContainer.popover == null) {
-            headerContainer.popover = PopupUtils.open(popoverComponent, searchTextField,
-                                                      {
-                                                          "contentWidth": searchTextField.width,
-                                                          "edgeMargins": units.gu(1)
-                                                      }
-                                                     );
-            searchTextField.forceActiveFocus();
+            openSearchAnimation.openPopup = true;
+        } else if (extraPanel.hasContents) {
+            // Show extraPanel
+            extraPanel.visible = true;
         }
     }
 
@@ -121,13 +128,11 @@
     }
 
     InverseMouseArea {
-        anchors { fill: parent; margins: units.gu(1); bottomMargin: units.gu(3) + bottomContainer.height }
+        anchors { fill: parent; margins: units.gu(1); bottomMargin: units.gu(3) + (extraPanel ? extraPanel.height : 0) }
         visible: headerContainer.showSearch
         onPressed: {
+            extraPanel.visible = false;
             closePopup(/* keepFocus */false);
-            if (!searchTextField.text) {
-                headerContainer.showSearch = false;
-            }
             mouse.accepted = false;
         }
     }
@@ -143,7 +148,6 @@
         contentY: showSearch ? 0 : height
 
         property bool showSearch: false
-        property var popover: null
 
         Background {
             id: background
@@ -154,12 +158,12 @@
         Behavior on contentY {
             UbuntuNumberAnimation {
                 id: openSearchAnimation
-                property bool openSearchHistory: false
+                property bool openPopup: false
 
                 onRunningChanged: {
-                    if (!running && openSearchAnimation.openSearchHistory) {
-                        openSearchAnimation.openSearchHistory = false;
-                        root.openSearchHistory();
+                    if (!running && openSearchAnimation.openPopup) {
+                        openSearchAnimation.openPopup = false;
+                        root.openPopup();
                     }
                 }
             }
@@ -183,61 +187,124 @@
                 backgroundColor: "transparent"
                 config: PageHeadConfiguration {
                     foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
-                    backAction: Action {
-                        iconName: "back"
-                        onTriggered: {
-                            root.resetSearch();
+                }
+                property var contents: Item {
+                    anchors.fill: parent
+
+                    TextField {
+                        id: searchTextField
+                        objectName: "searchTextField"
+                        inputMethodHints: Qt.ImhNoPredictiveText
+                        hasClearButton: false
+                        anchors {
+                            top: parent.top
+                            topMargin: units.gu(1)
+                            left: parent.left
+                            bottom: parent.bottom
+                            bottomMargin: units.gu(1)
+                            right: settingsButton.left
+                            rightMargin: settingsButton.visible ? 0 : units.gu(2)
+                        }
+
+                        primaryItem: Rectangle {
+                            color: "#F5F4F5"
+                            width: root.navigationTag != "" ? tagLabel.width + units.gu(2) : 0
+                            height: root.navigationTag != "" ? tagLabel.height + units.gu(1) : 0
+                            radius: units.gu(0.5)
+                            Label {
+                                id: tagLabel
+                                text: root.navigationTag
+                                anchors.centerIn: parent
+                                color: "#333333"
+                            }
+                        }
+
+                        secondaryItem: AbstractButton {
+                            id: clearButton
+                            height: searchTextField.height
+                            width: height
+                            enabled: searchTextField.text.length > 0 || root.navigationTag != ""
+
+                            Image {
+                                objectName: "clearIcon"
+                                anchors.fill: parent
+                                anchors.margins: units.gu(1)
+                                source: "image://theme/clear"
+                                opacity: parent.enabled
+                                visible: opacity > 0
+                                Behavior on opacity {
+                                    UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
+                                }
+                            }
+
+                            onClicked: {
+                                root.clearSearch(true);
+                            }
+                        }
+
+                        onActiveFocusChanged: {
+                            if (activeFocus) {
+                                root.searchTextFieldFocused();
+                                root.openPopup();
+                            }
+                        }
+
+                        onTextChanged: {
+                            if (text != "") {
+                                closePopup(/* keepFocus */true);
+                            }
+                        }
+                    }
+
+                    AbstractButton {
+                        id: settingsButton
+                        objectName: "settingsButton"
+
+                        width: root.scopeHasFilters ? height : 0
+                        visible: width > 0
+                        anchors {
+                            top: parent.top
+                            right: cancelButton.left
+                            bottom: parent.bottom
+                            rightMargin: units.gu(-1)
+                        }
+
+                        Icon {
+                            anchors.fill: parent
+                            anchors.margins: units.gu(2)
+                            name: "filters"
+                            color: root.activeFiltersCount > 0 ? UbuntuColors.orange : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+                        }
+
+                        onClicked: {
+                            root.showFiltersPopup(settingsButton);
+                        }
+                    }
+
+                    AbstractButton {
+                        id: cancelButton
+                        width: cancelLabel.width + cancelLabel.anchors.rightMargin + cancelLabel.anchors.leftMargin
+                        anchors {
+                            top: parent.top
+                            right: parent.right
+                            bottom: parent.bottom
+                        }
+                        onClicked: {
+                            root.clearSearch(false);
                             headerContainer.showSearch = false;
                         }
-                    }
-                }
-                property var contents: TextField {
-                    id: searchTextField
-                    objectName: "searchTextField"
-                    inputMethodHints: Qt.ImhNoPredictiveText
-                    hasClearButton: false
-                    anchors {
-                        fill: parent
-                        leftMargin: units.gu(1)
-                        topMargin: units.gu(1)
-                        bottomMargin: units.gu(1)
-                        rightMargin: root.width > units.gu(60) ? root.width - units.gu(40) : units.gu(1)
-                    }
-
-                    secondaryItem: AbstractButton {
-                        height: searchTextField.height
-                        width: height
-                        enabled: searchTextField.text.length > 0
-
-                        Image {
-                            objectName: "clearIcon"
-                            anchors.fill: parent
-                            anchors.margins: units.gu(.75)
-                            source: "image://theme/clear"
-                            opacity: searchTextField.text.length > 0
-                            visible: opacity > 0
-                            Behavior on opacity {
-                                UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
+                        Label {
+                            id: cancelLabel
+                            text: i18n.tr("Cancel")
+                            color: header.panelForegroundColor
+                            verticalAlignment: Text.AlignVCenter
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                right: parent.right
+                                rightMargin: units.gu(2)
+                                leftMargin: units.gu(1)
                             }
                         }
-
-                        onClicked: {
-                            root.resetSearch(true);
-                            root.openSearchHistory();
-                        }
-                    }
-
-                    onActiveFocusChanged: {
-                        if (activeFocus) {
-                            root.searchTextFieldFocused();
-                            root.openSearchHistory();
-                        }
-                    }
-
-                    onTextChanged: {
-                        if (text != "") {
-                            closePopup(/* keepFocus */true);
-                        }
                     }
                 }
             }
@@ -322,47 +389,6 @@
         }
     }
 
-    Component {
-        id: popoverComponent
-        Popover {
-            id: popover
-            autoClose: false
-
-            property bool unfocusOnDestruction: false
-
-            Component.onDestruction: {
-                headerContainer.popover = null;
-                if (unfocusOnDestruction) {
-                    root.unfocus();
-                }
-            }
-
-            Column {
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Repeater {
-                    id: recentSearches
-                    objectName: "recentSearches"
-                    model: searchHistory
-
-                    delegate: Standard {
-                        showDivider: index < recentSearches.count - 1
-                        text: query
-                        onClicked: {
-                            searchHistory.addQuery(text);
-                            searchTextField.text = text;
-                            closePopup(/* keepFocus */false);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     Rectangle {
         id: bottomBorder
         visible: showSignatureLine
@@ -370,7 +396,7 @@
             top: headerContainer.bottom
             left: parent.left
             right: parent.right
-            bottom: bottomContainer.top
+            bottom: parent.bottom
         }
 
         color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0"
@@ -411,7 +437,7 @@
         id: bottomHighlight
         visible: bottomBorder.visible
         anchors {
-            top: bottomContainer.top
+            top: parent.bottom
             left: parent.left
             right: parent.right
         }
@@ -419,30 +445,13 @@
         height: units.dp(1)
         opacity: 0.6
 
-        // FIXME this should be a shader when bottomItem exists
-        // to support image backgrounds
         Rectangle {
             anchors.fill: parent
-            color: if (bottomItem && bottomItem.background) {
-                       Qt.lighter(Qt.rgba(bottomItem.background.topColor.r,
-                                          bottomItem.background.topColor.g,
-                                          bottomItem.background.topColor.b, 1.0), 1.2);
-                   } else if (!bottomItem && root.scopeStyle) {
+            color: if (root.scopeStyle) {
                        Qt.lighter(Qt.rgba(root.scopeStyle.background.r,
                                           root.scopeStyle.background.g,
                                           root.scopeStyle.background.b, 1.0), 1.2);
                    } else "#CCFFFFFF"
         }
     }
-
-    Item {
-        id: bottomContainer
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: childrenRect.height
-    }
 }

=== added directory 'qml/Dash/Filters'
=== added file 'qml/Dash/Filters/FilterOptionSelector.qml'
--- qml/Dash/Filters/FilterOptionSelector.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Filters/FilterOptionSelector.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+
+/*! Option Selector Filter Widget. */
+
+FilterWidget {
+    id: root
+
+    implicitHeight: expandingItem.height
+
+    ListItems.Expandable {
+        id: expandingItem
+        objectName: "expandingItem"
+
+        expandedHeight: collapsedHeight + column.height
+        width: parent.width
+        showDivider: false
+
+        onClicked: {
+            expanded = !expanded;
+            forceActiveFocus();
+        }
+
+        Item {
+            id: holder
+            anchors.top: parent.top
+            height: expandingItem.collapsedHeight
+            width: parent.width
+
+            Label {
+                anchors.left: parent.left
+                anchors.right: dropDown.left
+                anchors.verticalCenter: parent.verticalCenter
+                text: widgetData.label || ""
+            }
+
+            Image {
+                id: dropDown
+                height: units.gu(3)
+                fillMode: Image.PreserveAspectFit
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                source: expandingItem.expanded ? "image://theme/up" : "image://theme/down"
+            }
+        }
+
+        Column {
+            id: column
+            anchors.top: holder.bottom
+            width: parent.width
+            Repeater {
+                model: widgetData.options
+
+                ListItems.Standard {
+                    text: label
+                    objectName: root.objectName + "label" + index;
+
+                    Image {
+                        height: units.gu(3)
+                        fillMode: Image.PreserveAspectFit
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+                        source: "image://theme/tick"
+                        visible: checked
+                    }
+
+                    onClicked: {
+                        widgetData.options.setChecked(index, !checked);
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'qml/Dash/Filters/FilterRangeInput.qml'
--- qml/Dash/Filters/FilterRangeInput.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Filters/FilterRangeInput.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 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.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.3
+
+/*! Range Input Filter Widget. */
+
+FilterWidget {
+    id: root
+
+    implicitHeight: field1.height + units.gu(2)
+
+    function setFieldValue(field, hasValue, value) {
+        if (hasValue) {
+            // Need this othewise if we are on 4.5 and backspace instead of
+            // having 4. in the text field we end up with 4 which is confusing
+            if (field.text != value) {
+                field.text = value;
+            }
+        } else {
+            field.text = "";
+        }
+    }
+
+    Connections {
+        target: widgetData
+        onStartValueChanged: root.setFieldValue(field1, widgetData.hasStartValue, widgetData.startValue);
+        onHasStartValueChanged: root.setFieldValue(field1, widgetData.hasStartValue, widgetData.startValue);
+        onEndValueChanged: root.setFieldValue(field2, widgetData.hasEndValue, widgetData.endValue);
+        onHasEndValueChanged: root.setFieldValue(field2, widgetData.hasEndValue, widgetData.endValue);
+    }
+
+    onWidgetDataChanged: {
+        if (widgetData) {
+            root.setFieldValue(field1, widgetData.hasStartValue, widgetData.startValue);
+            root.setFieldValue(field2, widgetData.hasEndValue, widgetData.endValue);
+        } else {
+            root.setFieldValue(field1, false, -1);
+            root.setFieldValue(field2, false, -1);
+        }
+    }
+
+    RowLayout {
+        anchors {
+            fill: parent
+            topMargin: units.gu(1)
+            bottomMargin: units.gu(1)
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        Label {
+            text: widgetData.startPrefixLabel
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        TextField {
+            id: field1
+            objectName: "startValueField"
+            implicitWidth: units.gu(9)
+            verticalAlignment: Text.AlignVCenter
+            inputMethodHints: Qt.ImhFormattedNumbersOnly
+            validator: DoubleValidator {
+                notation: DoubleValidator.StandardNotation
+            }
+            onTextChanged: {
+                if (text === "") widgetData.eraseStartValue();
+                else widgetData.startValue = text;
+            }
+        }
+
+        Label {
+            text: widgetData.startPostfixLabel
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        Label {
+            text: widgetData.centralLabel
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+
+        Label {
+            text: widgetData.endPrefixLabel
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        TextField {
+            id: field2
+            objectName: "endValueField"
+            implicitWidth: units.gu(9)
+            verticalAlignment: Text.AlignVCenter
+            inputMethodHints: Qt.ImhFormattedNumbersOnly
+            validator: DoubleValidator {
+                notation: DoubleValidator.StandardNotation
+            }
+            onTextChanged: {
+                if (text === "") widgetData.eraseEndValue();
+                else widgetData.endValue = text;
+            }
+        }
+
+        Label {
+            text: widgetData.endPostfixLabel
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        Item {
+            Layout.fillWidth: true
+        }
+    }
+}

=== added file 'qml/Dash/Filters/FilterValueSlider.qml'
--- qml/Dash/Filters/FilterValueSlider.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Filters/FilterValueSlider.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 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.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.3
+
+/*! Value Slider Filter Widget. */
+
+FilterWidget {
+    id: root
+
+    implicitHeight: childrenRect.height + units.gu(2)
+
+    Connections {
+        target: widgetData
+        // One would think that this is not needed since
+        // we have value: widgetData.value on the slider
+        // but it is, otherwise reset doesn't seem to work
+        onValueChanged: {
+            if (widgetData.value !== slider.value) {
+                slider.value = widgetData.value;
+            }
+        }
+    }
+
+    Slider {
+        id: slider
+        objectName: "slider"
+
+        anchors {
+            top: parent.top
+            topMargin: units.gu(1)
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+
+        minimumValue: widgetData.minValue
+        maximumValue: widgetData.maxValue
+        value: widgetData.value
+        onValueChanged: {
+            widgetData.value = value;
+        }
+        onPressedChanged: {
+            if (pressed) forceActiveFocus();
+        }
+
+        readonly property Item thumb: __internals.thumb
+        readonly property real barMinusThumb: __internals.barMinusThumb
+    }
+
+    Repeater {
+        objectName: "repeater"
+        model: widgetData.values
+        delegate: Label {
+            anchors {
+                top: slider.bottom
+                // The slider is too tall, so move a bit up
+                topMargin: -units.gu(1)
+            }
+            text: label
+            visible: value <= widgetData.maxValue && value >= widgetData.minValue
+            x: {
+                var halfThumbDifference = (width - slider.thumb.width) / 2;
+                var result = (value - widgetData.minValue) * slider.barMinusThumb / (widgetData.maxValue - widgetData.minValue) - halfThumbDifference;
+                result = Math.max(result, 0);
+                result = Math.min(result, slider.width - width);
+                return units.gu(2) + result;
+            }
+        }
+    }
+}

=== added file 'qml/Dash/Filters/FilterWidget.qml'
--- qml/Dash/Filters/FilterWidget.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Filters/FilterWidget.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 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.4
+
+/*! Interface for filter widgets. */
+
+Item {
+    //! The widget identifier
+    property string widgetId
+
+    //! Variable used to contain widget's data
+    property var widgetData: null
+
+    objectName: widgetId
+}

=== added file 'qml/Dash/Filters/FilterWidgetFactory.qml'
--- qml/Dash/Filters/FilterWidgetFactory.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Filters/FilterWidgetFactory.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 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.4
+import Ubuntu.Components 1.3
+import Unity 0.2
+
+//! \brief This component loads the widgets based on widgetType.
+
+Item {
+    id: root
+    //! Identifier of the widget.
+    property string widgetId: ""
+
+    //! Type of the widget to display.
+    property int widgetType
+
+    //! Widget data, forwarded to the widget as is.
+    property var widgetData: null
+
+    implicitHeight: title.height + title.anchors.topMargin + loader.height
+
+    Label {
+        id: title
+        text: widgetData ? widgetData.title : ""
+        height: text != "" ? implicitHeight : 0
+
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+
+            topMargin: height > 0 ? units.gu(1) : 0
+            leftMargin: units.gu(2)
+            rightMargin: anchors.leftMargin
+        }
+    }
+
+    property alias active: loader.active
+
+    Loader {
+        id: loader
+        objectName: "loader"
+
+        anchors {
+            top: title.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        source: widgetSource
+
+        readonly property url widgetSource: {
+            switch (widgetType) {
+                case Filters.OptionSelectorFilter: return "FilterOptionSelector.qml";
+                case Filters.RangeInputFilter: return "FilterRangeInput.qml";
+                case Filters.ValueSliderFilter: return "FilterValueSlider.qml";
+                default: return "";
+            }
+        }
+
+        onLoaded: {
+            item.widgetId = Qt.binding(function() { return root.widgetId } )
+            item.widgetData = Qt.binding(function() { return root.widgetData } )
+        }
+    }
+}

=== added file 'qml/Dash/FiltersPopover.qml'
--- qml/Dash/FiltersPopover.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/FiltersPopover.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2013-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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import "Filters" as Filters
+
+Popover {
+    id: root
+    objectName: "filtersPopover"
+
+    Flickable {
+        id: flickable
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: {
+            // Popover doesn't like being 75% or bigger than the screen (counting the "empty" part on top)
+            var posToRootParent = flickable.mapToItem(null, 0, 0).y;
+            var threeQuartersParent = root.parent.height * 3 / 4 - posToRootParent - 1;
+            var parentAndKeyboard = root.parent.height - posToRootParent - (Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height + units.gu(3) : 0)
+            return Math.min(parentAndKeyboard, Math.min(threeQuartersParent, column.height));
+        }
+        clip: true
+        contentHeight: column.height
+        contentWidth: width
+
+        Column {
+            id: column
+            width: parent.width
+
+            Item {
+                width: parent.width
+                height: resetLabel.height + units.gu(3)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        right: resetLabel.left
+                        margins: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+                    text: i18n.tr("Refine your results")
+                }
+                Label {
+                    id: resetLabel
+                    anchors {
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+                    text: i18n.tr("Reset")
+
+                    AbstractButton {
+                        anchors {
+                            fill: parent
+                            rightMargin: units.gu(-2)
+                            leftMargin: units.gu(-2)
+                            topMargin: units.gu(-1)
+                            bottomMargin: units.gu(-1)
+                        }
+                        onClicked: {
+                            scopeView.scope.resetFilters();
+                        }
+                    }
+                }
+            }
+
+            Repeater {
+                id: repeater
+                model: scopeView.scope.filters
+
+                delegate: Filters.FilterWidgetFactory {
+                    width: parent.width
+
+                    widgetId: id
+                    widgetType: type
+                    widgetData: filter
+
+                    ListItems.ThinDivider {
+                        anchors.bottom: parent.bottom
+                        visible: index != repeater.count - 1
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-03-10 22:39:17 +0000
+++ qml/Dash/GenericScopeView.qml	2016-03-15 19:17:30 +0000
@@ -16,6 +16,8 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import "../Components/SearchHistoryModel"
 import Utils 0.1
 import Unity 0.2
 import Dash 0.1
@@ -25,7 +27,6 @@
 FocusScope {
     id: scopeView
 
-    readonly property bool navigationDisableParentInteractive: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].disableParentInteractive : false
     property bool forceNonInteractive: false
     property var scope: null
     property UnitySortFilterProxyModel categories: categoryFilter
@@ -34,14 +35,15 @@
     property bool hasBackAction: false
     property bool enableHeightBehaviorOnNextCreation: false
     property var categoryView: categoryView
-    property bool showPageHeader: true
     readonly property alias subPageShown: subPageLoader.subPageShown
+    readonly property alias extraPanelShown: peExtraPanel.visible
     property int paginationCount: 0
     property int paginationIndex: 0
     property bool visibleToParent: false
     property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
     property var holdingList: null
     property bool wasCurrentOnMoveStart: false
+    property var filtersPopover: null
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
@@ -68,8 +70,7 @@
     }
 
     function resetSearch() {
-        if(pageHeaderLoader.item && showPageHeader)
-            pageHeaderLoader.item.resetSearch()
+        categoryView.pageHeader.resetSearch()
     }
 
     property var maybePreviewResult;
@@ -120,24 +121,26 @@
         if (!holdingList || !holdingList.moving) {
             wasCurrentOnMoveStart = scopeView.isCurrent;
         }
-        if (pageHeaderLoader.item && showPageHeader) {
-            pageHeaderLoader.item.resetSearch();
-        }
+        categoryView.pageHeader.resetSearch();
         subPageLoader.closeSubPage();
+        if (filtersPopover) {
+            PopupUtils.close(filtersPopover)
+            scopeView.filtersPopover = null;
+        }
     }
 
     Binding {
         target: scopeView.scope
         property: "searchQuery"
-        value: pageHeaderLoader.item ? pageHeaderLoader.item.searchQuery : ""
-        when: isCurrent && showPageHeader
+        value: categoryView.pageHeader.searchQuery
+        when: isCurrent
     }
 
     Binding {
-        target: pageHeaderLoader.item
+        target: categoryView.pageHeader
         property: "searchQuery"
         value: scopeView.scope ? scopeView.scope.searchQuery : ""
-        when: isCurrent && showPageHeader
+        when: isCurrent
     }
 
     Connections {
@@ -189,8 +192,8 @@
         property string expandedCategoryId: ""
         property int runMaximizeAfterSizeChanges: 0
 
-        readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&
-            ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))
+        readonly property bool pageHeaderTotallyVisible:
+            ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == categoryView.pageHeader.height))
 
         onExpandedCategoryIdChanged: {
             var firstCreated = firstCreatedIndex();
@@ -615,41 +618,68 @@
             }
         }
 
-        pageHeader: scopeView.showPageHeader ? pageHeaderLoader : null
-        Loader {
-            id: pageHeaderLoader
+        pageHeader: DashPageHeader {
+            objectName: "scopePageHeader"
             width: parent.width
-            sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
-            Component {
-                id: pageHeaderComponent
-                DashPageHeader {
-                    objectName: "scopePageHeader"
-                    width: parent.width
-                    title: scopeView.scope ? scopeView.scope.name : ""
-                    searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.ctr("Label: Hint for dash search line edit", "Search")
-                    showBackButton: scopeView.hasBackAction
-                    searchEntryEnabled: true
-                    settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
-                    favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
-                    favorite: scopeView.scope && scopeView.scope.favorite
-                    scopeStyle: scopeView.scopeStyle
-                    paginationCount: scopeView.paginationCount
-                    paginationIndex: scopeView.paginationIndex
-
-                    bottomItem: DashNavigation {
-                        scope: scopeView.scope
-                        anchors { left: parent.left; right: parent.right }
-                        windowHeight: scopeView.height
-                        windowWidth: scopeView.width
-                        scopeStyle: scopeView.scopeStyle
-                    }
-
-                    onBackClicked: scopeView.backClicked()
-                    onSettingsClicked: subPageLoader.openSubPage("settings")
-                    onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
-                    onSearchTextFieldFocused: scopeView.showHeader()
+            title: scopeView.scope ? scopeView.scope.name : ""
+            extraPanel: peExtraPanel
+            searchHistory: SearchHistoryModel
+            searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.ctr("Label: Hint for dash search line edit", "Search")
+            scopeHasFilters: scopeView.scope.filters != null
+            activeFiltersCount: scopeView.scope.activeFiltersCount
+            showBackButton: scopeView.hasBackAction
+            searchEntryEnabled: true
+            settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
+            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
+            favorite: scopeView.scope && scopeView.scope.favorite
+            navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
+            scopeStyle: scopeView.scopeStyle
+            paginationCount: scopeView.paginationCount
+            paginationIndex: scopeView.paginationIndex
+
+            onBackClicked: scopeView.backClicked()
+            onSettingsClicked: subPageLoader.openSubPage("settings")
+            onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
+            onSearchTextFieldFocused: scopeView.showHeader()
+            onClearSearch: { // keepPanelOpen
+                var panelOpen = peExtraPanel.visible;
+                resetSearch(keepPanelOpen);
+                scopeView.scope.resetPrimaryNavigationTag();
+                peExtraPanel.resetNavigation();
+                if ((panelOpen || searchHistory.count > 0) && keepPanelOpen) {
+                    openPopup();
                 }
             }
+            onShowFiltersPopup: { // item
+                extraPanel.visible = false;
+                scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
+            }
+        }
+
+        PageHeaderExtraPanel {
+            id: peExtraPanel
+            objectName: "peExtraPanel"
+            width: parent.width >= units.gu(60) ? units.gu(40) : parent.width
+            anchors {
+                top: categoryView.pageHeader.bottom
+                topMargin: -categoryView.pageHeader.signatureLineHeight
+            }
+            z: 1
+            visible: false
+
+            searchHistory: SearchHistoryModel
+            scope: scopeView.scope
+            windowHeight: scopeView.height
+
+            onHistoryItemClicked: {
+                SearchHistoryModel.addQuery(text);
+                categoryView.pageHeader.searchQuery = text;
+            }
+
+            onDashNavigationLeafClicked: {
+                categoryView.pageHeader.closePopup();
+                categoryView.pageHeader.unfocus();
+            }
         }
     }
 
@@ -658,7 +688,7 @@
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        height: parent.height - pullToRefresh.contentY + (pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].height - pageHeaderLoader.item.height : 0)
+        height: parent.height - pullToRefresh.contentY - categoryView.pageHeader.height
         clip: true
 
         PullToRefresh {
@@ -793,7 +823,7 @@
             open = true;
         }
 
-        onOpenChanged: pageHeaderLoader.item.unfocus()
+        onOpenChanged: categoryView.pageHeader.unfocus()
 
         onVisibleChanged: if (!visible) subPage = ""
 

=== added file 'qml/Dash/PageHeaderExtraPanel.qml'
--- qml/Dash/PageHeaderExtraPanel.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/PageHeaderExtraPanel.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2013-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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import "Filters" as Filters
+
+Item {
+    id: root
+
+    readonly property real searchesHeight: recentSearchesRepeater.count > 0 ? searchColumn.height + recentSearchesLabels.height + recentSearchesLabels.anchors.topMargin : 0
+
+    implicitHeight: searchesHeight + dashNavigation.implicitHeight + dashNavigation.anchors.topMargin + primaryFilter.height + primaryFilter.anchors.topMargin
+
+    // Set by parent
+    property ListModel searchHistory
+    property var scope: null
+    property real windowHeight
+
+    // Used by PageHeader
+    readonly property bool hasContents: searchHistory.count > 0 || scope && scope.hasNavigation || scope && scope.primaryNavigationFilter
+
+    signal historyItemClicked(string text)
+    signal dashNavigationLeafClicked()
+
+    function resetNavigation() {
+        dashNavigation.resetNavigation();
+    }
+
+    Rectangle {
+        color: "white"
+        anchors.fill: parent
+    }
+
+    ListItems.ThinDivider {
+        anchors.top: parent.top
+    }
+
+    Label {
+        id: recentSearchesLabels
+        text: i18n.tr("Recent Searches")
+        visible: recentSearchesRepeater.count > 0
+        anchors {
+            top: parent.top
+            left: parent.left
+            margins: units.gu(2)
+            topMargin: units.gu(3)
+        }
+    }
+
+    Label {
+        text: i18n.tr("Clear All")
+        fontSize: "small"
+        visible: recentSearchesRepeater.count > 0
+        anchors {
+            top: parent.top
+            right: parent.right
+            margins: units.gu(2)
+            topMargin: units.gu(3)
+        }
+
+        AbstractButton {
+            anchors.fill: parent
+            onClicked: searchHistory.clear();
+        }
+    }
+
+    Column {
+        id: searchColumn
+        anchors {
+            top: recentSearchesLabels.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        Repeater {
+            id: recentSearchesRepeater
+            objectName: "recentSearchesRepeater"
+            model: searchHistory
+
+            // FIXME Move to ListItem once 1556971 is fixed
+            delegate: ListItems.Empty {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    leftMargin: units.gu(2)
+                    rightMargin: units.gu(2)
+                }
+                height: units.gu(5)
+
+                Icon {
+                    id: searchIcon
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                    }
+                    height: units.gu(1.5)
+                    width: height
+                    name: "search"
+                }
+
+                Label {
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        left: searchIcon.right
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                    }
+                    text: query
+                    color: "#888888"
+                }
+
+                divider.visible: index != repeater.count - 1 || (scope && scope.hasNavigation) || primaryFilter.active
+
+                onClicked: root.historyItemClicked(query)
+            }
+        }
+    }
+
+    DashNavigation {
+        id: dashNavigation
+        scope: root.scope
+        anchors {
+            top: recentSearchesRepeater.count > 0 ? searchColumn.bottom : parent.top
+            topMargin: implicitHeight && recentSearchesRepeater.count > 0 ? units.gu(2) : 0
+            left: parent.left
+            right: parent.right
+        }
+        availableHeight: windowHeight * 4 / 6 - searchesHeight
+
+        onLeafClicked: root.dashNavigationLeafClicked();
+    }
+
+    Filters.FilterWidgetFactory {
+        id: primaryFilter
+        active: scope && !scope.hasNavigation
+
+        property var filter: active ? scope.primaryNavigationFilter : null
+
+        anchors {
+            top: recentSearchesRepeater.count > 0 ? searchColumn.bottom : parent.top
+            topMargin: active && recentSearchesRepeater.count > 0 ? units.gu(2) : 0
+            left: parent.left
+            right: parent.right
+        }
+
+        widgetId: filter ? filter.filterId : ""
+        widgetType: filter ? filter.filterType : -1
+        widgetData: filter
+    }
+
+    // This is outside the item
+    Image {
+        anchors {
+            top: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+        fillMode: Image.Stretch
+        source: "graphics/navigation_shadow.png"
+    }
+}

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2016-02-19 12:42:44 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2016-03-15 19:17:30 +0000
@@ -8,7 +8,7 @@
 add_subdirectory(Screens)
 
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -29,15 +29,28 @@
   fake_resultsmodel.cpp
   fake_previewmodel.cpp
   fake_previewwidgetmodel.cpp
+  fake_filters.cpp
+  fake_optionselectorfilter.cpp
+  fake_optionselectoroptions.cpp
+  fake_rangeinputfilter.cpp
+  fake_valuesliderfilter.cpp
+  fake_valueslidervalues.cpp
   fake_unity_plugin.cpp
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/FilterBaseInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/FiltersInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/NavigationInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorFilterInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorOptionsInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewWidgetModelInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/RangeInputFilterInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ResultsModelInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopesInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderFilterInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderValuesInterface.h
 )
 
 # Workaround for gcc failure LP: #1417664

=== added file 'tests/mocks/Unity/fake_filters.cpp'
--- tests/mocks/Unity/fake_filters.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_filters.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_filters.h"
+
+#include "fake_optionselectorfilter.h"
+#include "fake_rangeinputfilter.h"
+#include "fake_valuesliderfilter.h"
+#include "fake_scope.h"
+
+Filters::Filters(Scope* parent)
+ : unity::shell::scopes::FiltersInterface(parent)
+{
+    addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));
+
+    FakeRangeInputFilter *rif = new FakeRangeInputFilter("RIF1", "Tag3", this);
+    rif->setTitle("How much do you want to walk?");
+    rif->setCentralLabel("to");
+    rif->setStartPostfixLabel("m");
+    rif->setEndPostfixLabel("m");
+    addFilter(rif);
+
+    QMap<double, QString> labels;
+    labels[15] = "Default";
+    labels[50] = "50";
+    labels[100] = "100";
+    FakeValueSliderFilter *vsf = new FakeValueSliderFilter("VS1", "Tag4", 15, 10, 150, labels, this);
+    addFilter(vsf);
+
+    addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));
+}
+
+void Filters::addFilter(unity::shell::scopes::FilterBaseInterface *f)
+{
+    switch (f->filterType()) {
+        case FiltersInterface::OptionSelectorFilter: {
+            FakeOptionSelectorFilter *osf = static_cast<FakeOptionSelectorFilter *>(f);
+            connect(osf, &FakeOptionSelectorFilter::isActiveChanged, this, &Filters::activeFiltersCountChanged);
+        }
+        break;
+
+        case FiltersInterface::RangeInputFilter: {
+            FakeRangeInputFilter *rif = static_cast<FakeRangeInputFilter *>(f);
+            connect(rif, &FakeRangeInputFilter::isActiveChanged, this, &Filters::activeFiltersCountChanged);
+        }
+        break;
+
+        case FiltersInterface::ValueSliderFilter: {
+            // Not counting value slider as active in the mock
+        }
+
+        case Invalid:
+        break;
+    }
+    m_filters << f;
+}
+
+int Filters::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return m_filters.count();
+}
+
+QVariant Filters::data(const QModelIndex &index, int role) const
+{
+    const int row = index.row();
+    if (row < 0 || row >= m_filters.count())
+        return QVariant();
+
+    unity::shell::scopes::FilterBaseInterface *filter = m_filters[row];
+
+    switch (role) {
+        case RoleFilterId:
+            return filter->filterId();
+        case RoleFilterType:
+            return filter->filterType();
+        case RoleFilter:
+            return QVariant::fromValue<unity::shell::scopes::FilterBaseInterface *>(filter);
+        default:
+            return QVariant();
+    }
+}
+
+int Filters::activeFiltersCount() const
+{
+    int active = 0;
+    Q_FOREACH(unity::shell::scopes::FilterBaseInterface *f, m_filters) {
+        switch (f->filterType()) {
+            case  FiltersInterface::OptionSelectorFilter: {
+                FakeOptionSelectorFilter *osf = static_cast<FakeOptionSelectorFilter *>(f);
+                if (osf->isActive()) ++active;
+            }
+            break;
+
+            case  FiltersInterface::RangeInputFilter: {
+                FakeRangeInputFilter *rif = static_cast<FakeRangeInputFilter *>(f);
+                if (rif->isActive()) ++active;
+            }
+            break;
+
+            case FiltersInterface::ValueSliderFilter: {
+                // Not counting value slider as active in the mock
+            }
+
+            case Invalid:
+            break;
+        }
+    }
+    return active;
+}

=== added file 'tests/mocks/Unity/fake_filters.h'
--- tests/mocks/Unity/fake_filters.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_filters.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_FILTERS_H
+#define FAKE_FILTERS_H
+
+#include <unity/shell/scopes/FiltersInterface.h>
+#include <unity/shell/scopes/FilterBaseInterface.h>
+
+class Scope;
+
+class Filters : public unity::shell::scopes::FiltersInterface
+{
+    Q_OBJECT
+
+public:
+    Filters(Scope* parent);
+
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    int activeFiltersCount() const;
+
+Q_SIGNALS:
+    void activeFiltersCountChanged();
+
+private:
+    void addFilter(unity::shell::scopes::FilterBaseInterface* f);
+
+    QVector<unity::shell::scopes::FilterBaseInterface*> m_filters;
+};
+
+#endif

=== modified file 'tests/mocks/Unity/fake_navigation.cpp'
--- tests/mocks/Unity/fake_navigation.cpp	2015-08-19 13:56:21 +0000
+++ tests/mocks/Unity/fake_navigation.cpp	2016-03-15 19:17:30 +0000
@@ -32,7 +32,6 @@
 {
     QTimer::singleShot(1500, this, &Navigation::slotLoaded);
     connect(scope, &Scope::currentNavigationIdChanged, this, &Navigation::slotCurrentNavigationChanged);
-    connect(scope, &Scope::currentAltNavigationIdChanged, this, &Navigation::slotCurrentNavigationChanged);
 }
 
 QString Navigation::navigationId() const
@@ -78,17 +77,17 @@
 
 bool Navigation::isRoot() const
 {
-    return m_navigationId == "root" || m_navigationId == "altroot";
+    return m_navigationId == "root";
 }
 
 bool Navigation::hidden() const
 {
-    return m_navigationId == "altroot";
+    return false;
 }
 
 int Navigation::rowCount(const QModelIndex & /*parent*/) const
 {
-    if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId.startsWith("altrootChild") || m_navigationId == "middle3")
+    if (!m_loaded ||(m_navigationId.startsWith("child") && !m_navigationId.startsWith("childmiddle4")) || m_navigationId == "middle3")
         return 0;
     else
         return 8;
@@ -102,16 +101,16 @@
                 return QString("middle%1").arg(index.row());
             else if (m_navigationId.startsWith("middle"))
                 return QString("child%1%2").arg(m_navigationId).arg(index.row());
+            else if (m_navigationId.startsWith("childmiddle"))
+                return QString("grandchild%1%2").arg(m_navigationId).arg(index.row());
         case RoleLabel:
             return QString("%1Child%2").arg(m_navigationId).arg(index.row());
+        case RoleAllLabel:
+            return QString("all%1Child%2").arg(m_navigationId).arg(index.row());
         case RoleHasChildren:
-            return m_navigationId == "root" && index.row() != 3;
+            return (m_navigationId == "root" && index.row() != 3) || (m_navigationId == "middle4");
         case RoleIsActive:
-            if (m_navigationId.startsWith("alt")) {
-                return m_scope->currentAltNavigationId() == data(index, RoleNavigationId);
-            } else {
-                return m_scope->currentNavigationId() == data(index, RoleNavigationId);
-            }
+            return m_scope->currentNavigationId() == data(index, RoleNavigationId);
     }
     return QVariant();
 }

=== added file 'tests/mocks/Unity/fake_optionselectorfilter.cpp'
--- tests/mocks/Unity/fake_optionselectorfilter.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_optionselectorfilter.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_optionselectorfilter.h"
+
+#include "fake_optionselectoroptions.h"
+
+FakeOptionSelectorFilter::FakeOptionSelectorFilter(const QString &id, const QString &tag, const QString &label, bool multiselect, const QStringList &optionLabels, QObject* parent)
+ : unity::shell::scopes::OptionSelectorFilterInterface(parent),
+   m_filterId(id),
+   m_filterTag(tag),
+   m_label(label),
+   m_multiSelect(multiselect)
+{
+    m_options = new FakeOptionSelectorOptions(optionLabels, this);
+    connect(m_options, &FakeOptionSelectorOptions::anyCheckedChanged, this, &FakeOptionSelectorFilter::isActiveChanged);
+}
+
+QString FakeOptionSelectorFilter::filterId() const
+{
+    return m_filterId;
+}
+
+QString FakeOptionSelectorFilter::filterTag() const
+{
+    return m_filterTag;
+}
+
+QString FakeOptionSelectorFilter::title() const
+{
+    return m_title;
+}
+
+QString FakeOptionSelectorFilter::label() const
+{
+    return m_label;
+}
+
+bool FakeOptionSelectorFilter::multiSelect() const
+{
+    return m_multiSelect;
+}
+
+unity::shell::scopes::OptionSelectorOptionsInterface* FakeOptionSelectorFilter::options() const
+{
+    return m_options;
+}
+
+bool FakeOptionSelectorFilter::isActive() const
+{
+    return m_options->anyChecked();
+}

=== added file 'tests/mocks/Unity/fake_optionselectorfilter.h'
--- tests/mocks/Unity/fake_optionselectorfilter.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_optionselectorfilter.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_OPTIONSELECTORFILTER_H
+#define FAKE_OPTIONSELECTORFILTER_H
+
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+
+class FakeOptionSelectorOptions;
+
+class FakeOptionSelectorFilter : public unity::shell::scopes::OptionSelectorFilterInterface
+{
+    Q_OBJECT
+
+public:
+    FakeOptionSelectorFilter(const QString &id, const QString &tag, const QString &label, bool multiselect, const QStringList &optionLabels, QObject* parent);
+
+    QString filterId() const override;
+    QString filterTag() const override;
+    QString title() const override;
+    QString label() const override;
+    bool multiSelect() const override;
+    unity::shell::scopes::OptionSelectorOptionsInterface* options() const override;
+
+    bool isActive() const;
+
+Q_SIGNALS:
+    void isActiveChanged();
+
+private:
+    QString m_filterId;
+    QString m_filterTag;
+    QString m_title;
+    QString m_label;
+    bool m_multiSelect;
+    FakeOptionSelectorOptions* m_options;
+};
+
+#endif

=== added file 'tests/mocks/Unity/fake_optionselectoroptions.cpp'
--- tests/mocks/Unity/fake_optionselectoroptions.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_optionselectoroptions.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_optionselectoroptions.h"
+
+#include "fake_optionselectorfilter.h"
+
+FakeOptionSelectorOptions::FakeOptionSelectorOptions(const QStringList &optionLabels, FakeOptionSelectorFilter* parent)
+ : unity::shell::scopes::OptionSelectorOptionsInterface(parent),
+   m_optionLabels(optionLabels)
+{
+}
+
+int FakeOptionSelectorOptions::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return m_optionLabels.count();
+}
+
+QVariant FakeOptionSelectorOptions::data(const QModelIndex &index, int role) const
+{
+    const int row = index.row();
+    if (row < 0 || row >= m_optionLabels.count())
+        return QVariant();
+
+    switch (role) {
+        case RoleOptionId: {
+            const QString id = static_cast<FakeOptionSelectorFilter*>(parent())->filterId() + QString::number(row);
+            return id;
+        }
+        case RoleOptionLabel:
+            return m_optionLabels[row];
+        case RoleOptionChecked:
+            return m_checkedIndexes.contains(row);
+        default:
+            return QVariant();
+    }
+
+}
+
+void FakeOptionSelectorOptions::setChecked(int row, bool checked)
+{
+    if (checked) {
+        if (!static_cast<FakeOptionSelectorFilter*>(parent())->multiSelect()) {
+            if (!m_checkedIndexes.isEmpty()) {
+                setChecked(*m_checkedIndexes.begin(), false);
+            }
+            Q_ASSERT(m_checkedIndexes.isEmpty());
+        }
+        m_checkedIndexes << row;
+    } else {
+        m_checkedIndexes.remove(row);
+    }
+    const QModelIndex idx = index(row, 0);
+    Q_EMIT dataChanged(idx, idx,  QVector<int>() << RoleOptionChecked);
+    Q_EMIT anyCheckedChanged();
+}
+
+bool FakeOptionSelectorOptions::anyChecked() const
+{
+    return !m_checkedIndexes.isEmpty();
+}

=== added file 'tests/mocks/Unity/fake_optionselectoroptions.h'
--- tests/mocks/Unity/fake_optionselectoroptions.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_optionselectoroptions.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_OPTIONSELECTOROPTIONS_H
+#define FAKE_OPTIONSELECTOROPTIONS_H
+
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+
+#include <QSet>
+
+class FakeOptionSelectorFilter;
+
+class FakeOptionSelectorOptions : public unity::shell::scopes::OptionSelectorOptionsInterface
+{
+    Q_OBJECT
+
+public:
+    FakeOptionSelectorOptions(const QStringList &optionLabels, FakeOptionSelectorFilter* parent);
+
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    Q_INVOKABLE void setChecked(int index, bool checked) override;
+
+    bool anyChecked() const;
+
+Q_SIGNALS:
+    void anyCheckedChanged();
+
+private:
+    QStringList m_optionLabels;
+    QSet<int> m_checkedIndexes;
+};
+
+#endif

=== added file 'tests/mocks/Unity/fake_rangeinputfilter.cpp'
--- tests/mocks/Unity/fake_rangeinputfilter.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_rangeinputfilter.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_rangeinputfilter.h"
+
+FakeRangeInputFilter::FakeRangeInputFilter(const QString &id, const QString &tag, QObject* parent)
+ : unity::shell::scopes::RangeInputFilterInterface(parent),
+   m_filterId(id),
+   m_filterTag(tag),
+   m_hasStartValue(false),
+   m_hasEndValue(false),
+   m_startValue(-1),
+   m_endValue(-1)
+{
+    connect(this, &FakeRangeInputFilter::hasStartValueChanged, this, &FakeRangeInputFilter::isActiveChanged);
+    connect(this, &FakeRangeInputFilter::hasEndValueChanged, this, &FakeRangeInputFilter::isActiveChanged);
+}
+
+QString FakeRangeInputFilter::filterId() const
+{
+    return m_filterId;
+}
+
+QString FakeRangeInputFilter::filterTag() const
+{
+    return m_filterTag;
+}
+
+QString FakeRangeInputFilter::title() const
+{
+    return m_title;
+}
+
+double FakeRangeInputFilter::startValue() const
+{
+    return m_startValue;
+}
+
+double FakeRangeInputFilter::endValue() const
+{
+    return m_endValue;
+}
+
+void FakeRangeInputFilter::setStartValue(double value)
+{
+    if (m_startValue != value) {
+        m_startValue = value;
+        Q_EMIT startValueChanged();
+    }
+    if (!m_hasStartValue) {
+        m_hasStartValue = true;
+        Q_EMIT hasStartValueChanged();
+    }
+}
+
+void FakeRangeInputFilter::setEndValue(double value)
+{
+    if (m_endValue != value) {
+        m_endValue = value;
+        Q_EMIT endValueChanged();
+    }
+    if (!m_hasEndValue) {
+        m_hasEndValue = true;
+        Q_EMIT hasEndValueChanged();
+    }
+}
+
+QString FakeRangeInputFilter::startPrefixLabel() const
+{
+    return m_startPrefixLabel;
+}
+
+QString FakeRangeInputFilter::startPostfixLabel() const
+{
+    return m_startPostfixLabel;
+}
+
+QString FakeRangeInputFilter::centralLabel() const
+{
+    return m_centralLabel;
+}
+
+QString FakeRangeInputFilter::endPrefixLabel() const
+{
+    return m_endPrefixLabel;
+}
+
+QString FakeRangeInputFilter::endPostfixLabel() const
+{
+    return m_endPostfixLabel;
+}
+
+bool FakeRangeInputFilter::hasStartValue() const
+{
+    return m_hasStartValue;
+}
+
+bool FakeRangeInputFilter::hasEndValue() const
+{
+    return m_hasEndValue;
+}
+
+void FakeRangeInputFilter::eraseStartValue()
+{
+    m_hasStartValue = false;
+    Q_EMIT hasStartValueChanged();
+}
+
+void FakeRangeInputFilter::eraseEndValue()
+{
+    m_hasEndValue = false;
+    Q_EMIT hasEndValueChanged();
+}
+
+bool FakeRangeInputFilter::isActive() const
+{
+    return hasStartValue() && hasEndValue();
+}
+
+void FakeRangeInputFilter::setTitle(const QString &title)
+{
+    m_title = title;
+    Q_EMIT titleChanged();
+}
+
+void FakeRangeInputFilter::setStartPrefixLabel(const QString &startPrefixLabel)
+{
+    m_startPrefixLabel = startPrefixLabel;
+    Q_EMIT startPrefixLabelChanged();
+}
+
+void FakeRangeInputFilter::setStartPostfixLabel(const QString &startPostfixLabel)
+{
+    m_startPostfixLabel = startPostfixLabel;
+    Q_EMIT startPostfixLabelChanged();
+}
+
+void FakeRangeInputFilter::setCentralLabel(const QString &centralLabel)
+{
+    m_centralLabel = centralLabel;
+    Q_EMIT centralLabelChanged();
+}
+
+void FakeRangeInputFilter::setEndPrefixLabel(const QString &endPrefixLabel)
+{
+    m_endPrefixLabel = endPrefixLabel;
+    Q_EMIT endPrefixLabelChanged();
+}
+
+void FakeRangeInputFilter::setEndPostfixLabel(const QString &endPostfixLabel)
+{
+    m_endPostfixLabel = endPostfixLabel;
+    Q_EMIT endPostfixLabelChanged();
+}

=== added file 'tests/mocks/Unity/fake_rangeinputfilter.h'
--- tests/mocks/Unity/fake_rangeinputfilter.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_rangeinputfilter.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_RANGEINPUTFILTER_H
+#define FAKE_RANGEINPUTFILTER_H
+
+#include <unity/shell/scopes/RangeInputFilterInterface.h>
+
+class FakeRangeInputFilter : public unity::shell::scopes::RangeInputFilterInterface
+{
+    Q_OBJECT
+
+public:
+    FakeRangeInputFilter(const QString &id, const QString &tag, QObject* parent);
+
+    QString filterId() const override;
+    QString filterTag() const override;
+    QString title() const override;
+
+    double startValue() const override;
+    double endValue() const override;
+    void setStartValue(double value) override;
+    void setEndValue(double value)  override;
+    QString startPrefixLabel() const override;
+    QString startPostfixLabel() const override;
+    QString centralLabel() const override;
+    QString endPrefixLabel() const override;
+    QString endPostfixLabel() const override;
+    bool hasStartValue() const override;
+    bool hasEndValue() const override;
+
+    void eraseStartValue() override;
+    void eraseEndValue() override;
+
+    // Not part of the iface, for mock/testing purposes
+    bool isActive() const;
+
+    void setTitle(const QString &title);
+    void setStartPrefixLabel(const QString &startPrefixLabel);
+    void setStartPostfixLabel(const QString &startPostfixLabel);
+    void setCentralLabel(const QString &centralLabel);
+    void setEndPrefixLabel(const QString &endPrefixLabel);
+    void setEndPostfixLabel(const QString &endPostfixLabel);
+
+Q_SIGNALS:
+    void isActiveChanged();
+
+private:
+    QString m_filterId;
+    QString m_filterTag;
+    QString m_title;
+
+    bool m_hasStartValue;
+    bool m_hasEndValue;
+
+    double m_startValue;
+    double m_endValue;
+
+    QString m_startPrefixLabel;
+    QString m_startPostfixLabel;
+    QString m_centralLabel;
+    QString m_endPrefixLabel;
+    QString m_endPostfixLabel;
+};
+
+#endif

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2016-02-22 12:59:40 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2016-03-15 19:17:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Canonical, Ltd.
+ * Copyright (C) 2013, 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
@@ -19,7 +19,9 @@
 
 #include "fake_scope.h"
 
+#include "fake_filters.h"
 #include "fake_navigation.h"
+#include "fake_optionselectorfilter.h"
 #include "fake_resultsmodel.h"
 #include "fake_scopes.h"
 #include "fake_settingsmodel.h"
@@ -37,14 +39,18 @@
     , m_searching(false)
     , m_favorite(favorite)
     , m_isActive(false)
+    , m_hasNavigation(true)
+    , m_hasPrimaryFilter(true)
     , m_currentNavigationId("root")
-    , m_currentAltNavigationId("altrootChild1")
     , m_previewRendererName("preview-generic")
     , m_categories(new Categories(categories, this))
     , m_openScope(nullptr)
     , m_settings(new SettingsModel(this))
+    , m_filters(new Filters(this))
     , m_returnNullPreview(returnNullPreview)
 {
+    m_primaryNavigationFilter = new FakeOptionSelectorFilter("OSF3", "PFTag", "Which food you like More", false, QStringList() << "meat" << "vegetables", this);
+    connect(m_filters, &Filters::activeFiltersCountChanged, this, &Scope::activeFiltersCountChanged);
 }
 
 QString Scope::id() const
@@ -229,17 +235,13 @@
 
 bool Scope::hasNavigation() const
 {
-    return true;
-}
-
-QString Scope::currentAltNavigationId() const
-{
-    return m_currentAltNavigationId;
-}
-
-bool Scope::hasAltNavigation() const
-{
-    return true;
+    return m_hasNavigation;
+}
+
+void Scope::setHasNavigation(bool hasNavigation)
+{
+    m_hasNavigation = hasNavigation;
+    Q_EMIT hasNavigationChanged();
 }
 
 Scope::Status Scope::status() const
@@ -276,6 +278,11 @@
     Q_EMIT refreshed();
 }
 
+void Scope::resetFilters()
+{
+    qWarning() << "Scope::resetFilters is unimplemented";
+}
+
 void Scope::activateAction(QVariant const& /*result*/, QString const& /*categoryId*/, QString const& /*actionId*/)
 {
     qFatal("Using Scope::activateAction");
@@ -298,29 +305,47 @@
     return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
 }
 
-unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& id)
-{
-    if (id.isEmpty())
-        return nullptr;
-
-    QString parentId;
-    QString parentLabel;
-    if (id != "altroot") {
-        parentId = "altroot";
-        parentLabel = "altroot";
-    }
-    return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
-}
-
-void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
-{
-    if (isAltNavigation) {
-        m_currentAltNavigationId = navigationId;
-        Q_EMIT currentAltNavigationIdChanged();
-    } else {
-        m_currentNavigationId = navigationId;
-        Q_EMIT currentNavigationIdChanged();
-    }
+void Scope::setNavigationState(const QString &navigationId)
+{
+    m_currentNavigationId = navigationId;
+    Q_EMIT currentNavigationIdChanged();
+    Q_EMIT primaryNavigationTagChanged();
+}
+
+unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const
+{
+    return m_hasPrimaryFilter ? m_primaryNavigationFilter : nullptr;
+}
+
+unity::shell::scopes::FiltersInterface* Scope::filters() const
+{
+    return m_filters;
+}
+
+QString Scope::primaryNavigationTag() const
+{
+    if (m_currentNavigationId == "root")
+        return QString();
+    else
+        return const_cast<Scope*>(this)->getNavigation(m_currentNavigationId)->label();
+}
+
+int Scope::activeFiltersCount() const
+{
+    return m_filters->activeFiltersCount();
+}
+
+void Scope::resetPrimaryNavigationTag()
+{
+    if (m_currentNavigationId != "root") {
+        setNavigationState("root");
+    }
+}
+
+void Scope::setHasPrimaryFilter(bool hasPrimaryFilter)
+{
+    m_hasPrimaryFilter = hasPrimaryFilter;
+    Q_EMIT primaryNavigationFilterChanged();
 }
 
 void Scope::performQuery(const QString& query)

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2016-02-19 11:42:42 +0000
+++ tests/mocks/Unity/fake_scope.h	2016-03-15 19:17:30 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Canonical, Ltd.
+ * Copyright (C) 2013, 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
@@ -24,7 +24,9 @@
 
 #include <QTimer>
 
+class Filters;
 class Scopes;
+class FakeOptionSelectorFilter;
 
 class Scope : public unity::shell::scopes::ScopeInterface
 {
@@ -68,11 +70,17 @@
 
     QString currentNavigationId() const  override;
     bool hasNavigation() const  override;
-    QString currentAltNavigationId() const  override;
-    bool hasAltNavigation() const  override;
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;
-    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;
-    Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;
+    Q_INVOKABLE void setNavigationState(const QString &navigationId) override;
+    Q_INVOKABLE void setHasNavigation(bool hasNavigation); // This is not invokable in the Interface, here for testing benefits
+
+    unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;
+    unity::shell::scopes::FiltersInterface* filters() const override;
+    QString primaryNavigationTag() const override;
+    int activeFiltersCount() const override;
+    Q_INVOKABLE void resetPrimaryNavigationTag() override;
+    Q_INVOKABLE void setHasPrimaryFilter(bool hasPrimaryFilter); // This is not invokable in the Interface, here for testing benefits
+
     void performQuery(const QString& query) override;
 
     Status status() const override;
@@ -80,7 +88,9 @@
 
     Q_INVOKABLE void refresh() override;
 
-    Q_INVOKABLE virtual void activateAction(QVariant const& result, QString const& categoryId, QString const& actionId) override;
+    Q_INVOKABLE void resetFilters() override;
+
+    Q_INVOKABLE void activateAction(QVariant const& result, QString const& categoryId, QString const& actionId) override;
 
 Q_SIGNALS:
     // These are not in the Interface, here for testing benefits
@@ -99,14 +109,17 @@
     bool m_searching;
     bool m_favorite;
     bool m_isActive;
+    bool m_hasNavigation;
+    bool m_hasPrimaryFilter;
     QString m_currentNavigationId;
-    QString m_currentAltNavigationId;
 
     QString m_previewRendererName;
 
     unity::shell::scopes::CategoriesInterface* m_categories;
     unity::shell::scopes::ScopeInterface* m_openScope;
     unity::shell::scopes::SettingsModelInterface* m_settings;
+    Filters* m_filters;
+    FakeOptionSelectorFilter* m_primaryNavigationFilter;
 
     bool m_returnNullPreview;
 };

=== modified file 'tests/mocks/Unity/fake_unity_plugin.cpp'
--- tests/mocks/Unity/fake_unity_plugin.cpp	2016-02-19 11:42:42 +0000
+++ tests/mocks/Unity/fake_unity_plugin.cpp	2016-03-15 19:17:30 +0000
@@ -22,11 +22,14 @@
 // local
 #include "fake_scopes.h"
 #include "fake_categories.h"
+#include "fake_filters.h"
 #include "fake_navigation.h"
+#include "fake_optionselectoroptions.h"
 #include "fake_previewmodel.h"
 #include "fake_previewwidgetmodel.h"
 #include "fake_resultsmodel.h"
 #include "fake_settingsmodel.h"
+#include "fake_valueslidervalues.h"
 
 // External
 #include <glib-object.h>
@@ -52,4 +55,8 @@
     qmlRegisterType<ResultsModel>(uri, 0, 2, "FakeResultsModel");
     qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
     qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::FiltersInterface>(uri, 0, 2, "Filters", "Can't create Filters object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::FilterBaseInterface>(uri, 0, 2, "Filter", "Can't create Filter object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorOptionsInterface>(uri, 0, 2, "OptionSelectorOptions", "Can't create OptionSelectorOptions object in QML");
+    qmlRegisterUncreatableType<unity::shell::scopes::ValueSliderValuesInterface>(uri, 0, 2, "ValueSliderValues", "Can't create ValueSliderValuesInterface object in QML");
 }

=== added file 'tests/mocks/Unity/fake_valuesliderfilter.cpp'
--- tests/mocks/Unity/fake_valuesliderfilter.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_valuesliderfilter.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_valuesliderfilter.h"
+#include "fake_valueslidervalues.h"
+
+FakeValueSliderFilter::FakeValueSliderFilter(const QString &id, const QString &tag, double value, double minValue, double maxValue, const QMap<double, QString> &labels, QObject* parent)
+ : unity::shell::scopes::ValueSliderFilterInterface(parent),
+   m_filterId(id),
+   m_filterTag(tag),
+   m_value(value),
+   m_minValue(minValue),
+   m_maxValue(maxValue),
+   m_values(new FakeValueSliderValues(labels, this))
+{
+}
+
+QString FakeValueSliderFilter::filterId() const
+{
+    return m_filterId;
+}
+
+QString FakeValueSliderFilter::filterTag() const
+{
+    return m_filterTag;
+}
+
+QString FakeValueSliderFilter::title() const
+{
+    return m_title;
+}
+
+double FakeValueSliderFilter::value() const
+{
+    return m_value;
+}
+
+void FakeValueSliderFilter::setValue(double value)
+{
+    if (value != m_value) {
+        m_value = value;
+        Q_EMIT valueChanged();
+    }
+}
+
+double FakeValueSliderFilter::minValue() const
+{
+    return  m_minValue;
+}
+
+double FakeValueSliderFilter::maxValue() const
+{
+    return  m_maxValue;
+}
+
+unity::shell::scopes::ValueSliderValuesInterface* FakeValueSliderFilter::values() const
+{
+    return m_values;
+}
+
+bool FakeValueSliderFilter::isActive() const
+{
+    // Doesn't really matter
+    return false;
+}
+
+void FakeValueSliderFilter::setTitle(const QString &title)
+{
+    m_title = title;
+    Q_EMIT titleChanged();
+}

=== added file 'tests/mocks/Unity/fake_valuesliderfilter.h'
--- tests/mocks/Unity/fake_valuesliderfilter.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_valuesliderfilter.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_VALUESLIDERFILTER_H
+#define FAKE_VALUESLIDERFILTER_H
+
+#include <unity/shell/scopes/ValueSliderFilterInterface.h>
+
+class FakeValueSliderFilter : public unity::shell::scopes::ValueSliderFilterInterface
+{
+    Q_OBJECT
+
+public:
+    FakeValueSliderFilter(const QString &id, const QString &tag, double value, double minValue, double maxValue, const QMap<double, QString> &labels, QObject* parent);
+
+    QString filterId() const override;
+    QString filterTag() const override;
+    QString title() const override;
+
+    double value() const override;
+    void setValue(double value) override;
+    double minValue() const override;
+    double maxValue() const override;
+    unity::shell::scopes::ValueSliderValuesInterface* values() const override;
+
+    // Not part of the iface, for mock/testing purposes
+    bool isActive() const;
+
+    void setTitle(const QString &title);
+
+private:
+    QString m_filterId;
+    QString m_filterTag;
+    QString m_title;
+
+    double m_value;
+    double m_minValue;
+    double m_maxValue;
+    unity::shell::scopes::ValueSliderValuesInterface *m_values;
+};
+
+#endif

=== added file 'tests/mocks/Unity/fake_valueslidervalues.cpp'
--- tests/mocks/Unity/fake_valueslidervalues.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_valueslidervalues.cpp	2016-03-15 19:17:30 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#include "fake_valueslidervalues.h"
+
+FakeValueSliderValues::FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent)
+ : unity::shell::scopes::ValueSliderValuesInterface(parent)
+ , m_labels(labels)
+{
+}
+
+int FakeValueSliderValues::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return m_labels.count();
+}
+
+QVariant FakeValueSliderValues::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    const int row = index.row();
+    auto it = m_labels.begin();
+    it += row;
+
+    switch (role) {
+        case RoleValue:
+            return it.key();
+
+        case RoleLabel:
+            return it.value();
+    }
+
+    return QVariant();
+}

=== added file 'tests/mocks/Unity/fake_valueslidervalues.h'
--- tests/mocks/Unity/fake_valueslidervalues.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_valueslidervalues.h	2016-03-15 19:17:30 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 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/>.
+ */
+
+#ifndef FAKE_VALUESLIDERVALUES_H
+#define FAKE_VALUESLIDERVALUES_H
+
+#include <unity/shell/scopes/ValueSliderValuesInterface.h>
+
+class FakeValueSliderValues : public unity::shell::scopes::ValueSliderValuesInterface
+{
+    Q_OBJECT
+
+public:
+    FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent);
+
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+private:
+    const QMap<double, QString> m_labels;
+};
+
+#endif

=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml	2015-07-15 15:07:19 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2016-03-15 19:17:30 +0000
@@ -137,7 +137,7 @@
 
         function test_headerBackground_data() {
             return [
-                { tag: "default", index: 0, headerBackground: "color:///#f5f5f5" },
+                { tag: "default", index: 0, headerBackground: "color:///#ffffff" },
                 { tag: "black", index: 3, headerBackground: "gradient:///white/blue" },
             ];
         }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-03-10 22:41:38 +0000
+++ tests/qmltests/CMakeLists.txt	2016-03-15 19:17:30 +0000
@@ -53,6 +53,10 @@
 add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
 add_unity8_qmltest(Dash/Previews PreviewWidgetFactory)
 add_unity8_qmltest(Dash/Previews PreviewZoomableImage)
+add_unity8_qmltest(Dash/Filters FilterOptionSelector)
+add_unity8_qmltest(Dash/Filters FilterRangeInput)
+add_unity8_qmltest(Dash/Filters FilterValueSlider)
+add_unity8_qmltest(Dash/Filters FilterWidgetFactory)
 add_unity8_qmltest(Dash/ScopeSettings ScopeSettingBoolean)
 add_unity8_qmltest(Dash/ScopeSettings ScopeSettingList)
 add_unity8_qmltest(Dash/ScopeSettings ScopeSettingNumber)

=== added directory 'tests/qmltests/Dash/Filters'
=== added file 'tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml'
--- tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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.4
+import QtTest 1.0
+import "../../../../qml/Dash/Filters"
+import Unity.Test 0.1 as UT
+import Unity 0.2
+import Ubuntu.Components 1.3
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+    color: theme.palette.selected.background
+
+    property var singleSelectionWidgetData
+
+    ListModel {
+        id: optionsSingleSelect
+        ListElement {
+            label: "A"
+            checked: false
+        }
+        ListElement {
+            label: "B"
+            checked: false
+        }
+        ListElement {
+            label: "C"
+            checked: false
+        }
+
+        function setChecked(index, checked) {
+            for (var i = 0; i < optionsSingleSelect.count; ++i)
+                optionsSingleSelect.setProperty(i, "checked", false);
+            optionsSingleSelect.setProperty(index, "checked", checked);
+        }
+    }
+
+    Component.onCompleted: {
+        singleSelectionWidgetData = { label: "Hola", options: optionsSingleSelect }
+    }
+
+    FilterWidgetFactory {
+        id: factory
+        widgetId: "testOptionSelectorFilter"
+        widgetType: Filters.OptionSelectorFilter
+        widgetData: singleSelectionWidgetData
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "FilterOptionSelector"
+        when: windowShown
+
+        function test_optionSelector() {
+            var expandingItem = findChild(factory, "expandingItem");
+            // Open the selector
+            mouseClick(factory);
+            // wait for it to stop growing
+            tryCompare(factory, "implicitHeight", expandingItem.expandedHeight);
+
+            // Check the first option
+            var option0 = findChild(factory, "testOptionSelectorFilterlabel0");
+            mouseClick(option0);
+            verify(optionsSingleSelect.get(0).checked);
+
+            // Check the second option
+            var option1 = findChild(factory, "testOptionSelectorFilterlabel1");
+            mouseClick(option1);
+            verify(!optionsSingleSelect.get(0).checked);
+            verify(optionsSingleSelect.get(1).checked);
+
+            // Uncheck the second option
+            mouseClick(option1);
+            verify(!optionsSingleSelect.get(1).checked);
+        }
+    }
+}

=== added file 'tests/qmltests/Dash/Filters/tst_FilterRangeInput.qml'
--- tests/qmltests/Dash/Filters/tst_FilterRangeInput.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Filters/tst_FilterRangeInput.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,247 @@
+/*
+ * 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
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import "../../../../qml/Dash/Filters"
+import Unity.Test 0.1 as UT
+import Unity 0.2
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+    color: theme.palette.selected.background
+
+    QtObject {
+        id: widgetData1
+
+        property string title
+        property real startValue
+        property real endValue
+        property bool hasStartValue
+        property bool hasEndValue
+        property string startPrefixLabel
+        property string startPostfixLabel
+        property string centralLabel
+        property string endPrefixLabel
+        property string endPostfixLabel
+
+        onStartValueChanged: {
+            hasStartValue = true;
+        }
+
+        onEndValueChanged: {
+            hasEndValue = true;
+        }
+
+        function eraseStartValue() {
+            hasStartValue = false;
+        }
+
+        function eraseEndValue() {
+            hasEndValue = false;
+        }
+    }
+
+    Component.onCompleted: {
+        generateData();
+    }
+
+    function generateData() {
+        widgetData1.title = title.text
+        widgetData1.startValue = startValue.text;
+        widgetData1.endValue = endValue.text;
+        widgetData1.hasStartValue = startValueHasValue.checked;
+        widgetData1.hasEndValue  = endValueHasValue.checked;
+        widgetData1.startPrefixLabel = startValuePrefixLabel.text;
+        widgetData1.startPostfixLabel = startValuePostfixLabel.text;
+        widgetData1.centralLabel = centralLabel.text;
+        widgetData1.endPrefixLabel = endValuePrefixLabel.text;
+        widgetData1.endPostfixLabel = endValuePostfixLabel.text;
+
+        factory.widgetData = widgetData1;
+    }
+
+    FilterWidgetFactory {
+        id: factory
+        widgetId: "testRangeInputFilter"
+        widgetType: Filters.RangeInputFilter
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        clip: true
+    }
+
+    Column {
+        anchors.top: factory.bottom
+        width: parent.width
+        spacing: units.gu(1)
+
+        Text {
+            text: "Values"
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "Title"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: title
+                text: ""
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "Start Value Prefix Label"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: startValuePrefixLabel
+                text: "Pre1"
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "Start Value Postfix Label"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: startValuePostfixLabel
+                text: "Post1"
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "Central Label"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: centralLabel
+                text: "to"
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "End Value Prefix Label"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: endValuePrefixLabel
+                text: "Pre2"
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "End Value Postfix Label"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: endValuePostfixLabel
+                text: "Post2"
+            }
+        }
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "Start Value"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: startValue
+                text: "-1"
+            }
+            CheckBox {
+                id: startValueHasValue
+            }
+        }
+
+
+        Row {
+            spacing: units.gu(1)
+            Text {
+                text: "End Value"
+                verticalAlignment: Text.AlignVCenter
+                height: parent.height
+            }
+            TextField {
+                id: endValue
+                text: "5"
+            }
+            CheckBox {
+                id: endValueHasValue
+                checked: true
+            }
+        }
+
+        Button {
+            text: "Set Values"
+            onClicked: root.generateData();
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "FilterRangeInput"
+        when: windowShown
+
+        function init() {
+            root.generateData();
+        }
+
+        function test_initialStatus() {
+            var startValueField = findChild(factory, "startValueField");
+            compare(startValueField.text, "");
+
+            var endValueField = findChild(factory, "endValueField");
+            compare(endValueField.text, "5");
+        }
+
+        function test_dotStays() {
+            var startValueField = findChild(factory, "startValueField");
+            compare(startValueField.text, "");
+
+            startValueField.text = "4.5";
+            compare(startValueField.text, "4.5");
+            compare(widgetData1.startValue, 4.5);
+
+            startValueField.text = "4.";
+            compare(startValueField.text, "4.");
+            compare(widgetData1.startValue, 4);
+        }
+    }
+}

=== added file 'tests/qmltests/Dash/Filters/tst_FilterValueSlider.qml'
--- tests/qmltests/Dash/Filters/tst_FilterValueSlider.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Filters/tst_FilterValueSlider.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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
+ * 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.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import "../../../../qml/Dash/Filters"
+import Unity.Test 0.1 as UT
+import Unity 0.2
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+    color: theme.palette.selected.background
+
+    QtObject {
+        id: widgetData1
+
+        property string title
+        property int value: 30
+        property int minValue: 10
+        property int maxValue: 150
+
+        property ListModel values: ListModel {
+            ListElement {
+                value: 10
+                label: "10"
+            }
+            ListElement {
+                value: 30
+                label: "30"
+            }
+            ListElement {
+                value: 100
+                label: "100"
+            }
+            ListElement {
+                value: 150
+                label: "150"
+            }
+        }
+    }
+
+    FilterWidgetFactory {
+        id: factory
+        widgetId: "testRangeValueSlider"
+        widgetType: Filters.ValueSliderFilter
+        widgetData: widgetData1;
+        y: 100
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "FilterValueSlider"
+        when: windowShown
+
+        function test_valueChanges() {
+            var slider = findChild(factory, "slider");
+            compare(slider.value, 30);
+
+            slider.value = 50
+            compare(widgetData1.value, 50);
+        }
+
+        function test_labelPositions() {
+            var slider = findChild(factory, "slider");
+            var repeater = findChild(factory, "repeater");
+
+            // It's very hard to check the position of the
+            // labels is right, but at least we can check
+            // they all have different X positions and the
+            // same Y one
+            compare(repeater.count, 4);
+            for (var i = 0; i < repeater.count; ++i) {
+                var itemI = repeater.itemAt(i);
+                for (var j = i + 1; j < repeater.count; ++j) {
+                    var itemJ = repeater.itemAt(j);
+                    verify(itemI.x != itemJ.x);
+                    verify(itemI.y == itemJ.y);
+                }
+            }
+        }
+    }
+}

=== added file 'tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml'
--- tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml	2016-03-15 19:17:30 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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
+ * 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.4
+import QtTest 1.0
+import "../../../../qml/Dash/Filters"
+import Unity.Test 0.1 as UT
+import Unity 0.2
+import Ubuntu.Components 1.3
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+    color: theme.palette.selected.background
+
+    FilterWidgetFactory {
+        id: factory
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "FilterWidgetFactory"
+        when: windowShown
+
+        function test_mapping_data() {
+            return [
+                { tag: "OptionSelector", type: Filters.OptionSelectorFilter, source: "FilterOptionSelector.qml" },
+                { tag: "RangeInputFilter", type: Filters.RangeInputFilter, source: "FilterRangeInput.qml" },
+                { tag: "ValueSliderFilter", type: Filters.ValueSliderFilter, source: "FilterValueSlider.qml" }
+            ];
+        }
+
+        function test_mapping(data) {
+            factory.widgetData = {};
+            factory.widgetType = data.type;
+
+            var loader = findChild(factory, "loader");
+            verify((String(loader.source)).indexOf(data.source) != -1);
+        }
+    }
+}

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2015-12-16 14:35:39 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-03-15 19:17:30 +0000
@@ -284,14 +284,15 @@
             var dashContentList = findChild(dashContent, "dashContentList");
             tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
             var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
-            tryCompare(dashNavigation, "visible", true);
-            var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");
-            compare(dashNavigationButton.showList, false);
-            waitForRendering(dashNavigationButton);
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+            var searchButton = findChild(dashContentList.currentItem, "search_button");
+            var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
+            compare(peExtraPanel.visible, false);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+            peExtraPanel.searchHistory.clear();
 
-            var navigationListView = findChild(dashNavigationButton, "navigationListView");
+            var navigationListView = findChild(dashNavigation, "navigationListView");
             tryCompareFunction(function() {
                 return navigationListView.currentItem &&
                        navigationListView.currentItem.navigation &&
@@ -300,235 +301,247 @@
             waitForRendering(navigationListView);
             waitForRendering(navigationListView.currentItem);
 
-            var allButton = findChild(dashNavigationButton, "allButton");
-            compare(allButton.visible, false);
-
-            var navigation = findChild(dashNavigationButton, "navigation0child3");
-            mouseClick(navigation);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle3");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-            waitForRendering(navigationListView);
-            waitForRendering(navigationListView.currentItem);
-            compare(allButton.visible, true);
-
-            mouseClick(allButton);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-            waitForRendering(navigationListView);
-            waitForRendering(navigationListView.currentItem);
-            compare(allButton.visible, false);
-
-            navigation = findChild(dashNavigationButton, "navigation0child2");
-            mouseClick(navigation);
-            compare(dashNavigationButton.showList, true);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
+            var navigation = findChild(dashNavigation, "navigation0child3");
+            mouseClick(navigation);
+            compare(peExtraPanel.visible, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+
+            mouseClick(searchTextField);
+            tryCompare(peExtraPanel, "visible", true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            var header0 = findChild(dashNavigation, "dashNavigationHeader0");
+            compare(header0.backVisible, false);
+            mouseClick(header0);
+            compare(peExtraPanel.visible, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+
+            var headerContainer = findChild(dashContentList.currentItem, "headerContainer");
+            tryCompare(headerContainer, "contentY", headerContainer.height);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            navigation = findChild(dashNavigation, "navigation0child2");
+            mouseClick(navigation);
+            compare(peExtraPanel.visible, true);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
             tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
 
-            var navigationList1 = findChild(dashNavigationButton, "navigation1");
-            allButton = findChild(navigationList1, "allButton");
-            var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");
-            compare(allButton.visible, true);
-            compare(backButton.visible, true);
+            var navigationList1 = findChild(dashNavigation, "navigation1");
+            var header1 = findChild(dashNavigation, "dashNavigationHeader1");
+            compare(header0.height, 0);
+            compare(header1.backVisible, true);
 
             tryCompare(navigationListView, "contentX", navigationList1.x);
             waitForRendering(navigationListView);
-            mouseClick(allButton);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
+            mouseClick(header1);
+            compare(peExtraPanel.visible, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
             tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
 
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
+            mouseClick(searchTextField);
+            tryCompare(peExtraPanel, "visible", true);
             waitForRendering(navigationListView);
             waitForRendering(navigationListView.currentItem);
-            compare(allButton.visible, true);
-            compare(backButton.visible, true);
+            compare(header0.height, 0);
+            compare(header1.backVisible, true);
 
             tryCompare(navigationList1.navigation, "loaded", true);
-            tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);
+            tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 8);
             tryCompare(navigationList1, "height", navigationList1.implicitHeight);
-            navigation = findChild(dashNavigationButton, "navigation1child2");
+            navigation = findChild(dashNavigation, "navigation1child2");
             mouseClick(navigation);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle22");
+            compare(peExtraPanel.visible, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");
             tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
 
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
+            mouseClick(searchTextField);
+            tryCompare(peExtraPanel, "visible", true);
             waitForRendering(navigationListView);
             waitForRendering(navigationListView.currentItem);
 
             tryCompare(navigationList1.navigation, "loaded", true);
-            navigation = findChild(dashNavigationButton, "navigation1child3");
+            navigation = findChild(dashNavigation, "navigation1child3");
             mouseClick(navigation);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle23");
+            compare(peExtraPanel.visible, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");
             tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
 
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
+            mouseClick(searchTextField);
+            tryCompare(peExtraPanel, "visible", true);
             waitForRendering(navigationListView);
             waitForRendering(navigationListView.currentItem);
-            mouseClick(backButton);
+            mouseClick(findChild(header1, "backButton"));
 
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
             tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
-            compare(dashNavigationButton.showList, true);
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, false);
+            compare(peExtraPanel.visible, true);
+            mouseClick(header0);
+            compare(peExtraPanel.visible, false);
 
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
+            tryCompare(headerContainer, "contentY", headerContainer.height);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
             tryCompare(navigationListView.currentItem.navigation, "loaded", true);
-            var navigationList0 = findChild(dashNavigationButton, "navigation0");
+            var navigationList0 = findChild(dashNavigation, "navigation0");
             tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
             tryCompare(navigationList0, "height", navigationList0.implicitHeight);
-            navigation = findChild(dashNavigationButton, "navigation0child2");
+            navigation = findChild(dashNavigation, "navigation0child2");
             mouseClick(navigation);
-            compare(dashNavigationButton.showList, true);
-            navigationList1 = findChild(dashNavigationButton, "navigation1");
+            compare(peExtraPanel.visible, true);
+            navigationList1 = findChild(dashNavigation, "navigation1");
             compare(navigationList1.navigation.loaded, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
-            allButton = findChild(navigationList1, "allButton");
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
-            mouseClick(allButton);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
-        }
-
-        function test_altNavigation() {
-            var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
-            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
-            tryCompare(dashNavigation, "visible", true);
-            var dashNavigationButton = findChild(dashContentList.currentItem, "altNavigationButton");
-            verify(dashNavigationButton, "Can't find navigation button");
-
-            compare(dashNavigationButton.showList, false);
-            waitForRendering(dashNavigationButton);
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-
-            var navigationListView = findChild(dashNavigationButton, "navigationListView");
-            tryCompareFunction(function() {
-                return navigationListView.currentItem &&
-                       navigationListView.currentItem.navigation &&
-                       navigationListView.currentItem.navigation.loaded; }, true);
-
-            waitForRendering(navigationListView);
-            waitForRendering(navigationListView.currentItem);
-
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "altrootChild1");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "altroot");
-
-            var allButton = findChild(dashNavigationButton, "allButton");
-            compare(allButton.visible, false);
-            var backButton = findChild(navigationListView, "backButton");
-            compare(backButton.visible, false);
-
-            var navigation = findChild(dashNavigationButton, "navigation0child3");
-            mouseClick(navigation);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "altrootChild3");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "altroot");
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-            waitForRendering(navigationListView);
-            waitForRendering(navigationListView.currentItem);
-            compare(allButton.visible, false);
-
-            navigation = findChild(dashNavigationButton, "navigation0child2");
-            mouseClick(navigation);
-            compare(dashNavigationButton.showList, false);
-            tryCompare(dashNavigationButton.currentNavigation, "navigationId", "altrootChild2");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "altroot");
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-            waitForRendering(navigationListView);
-            waitForRendering(navigationListView.currentItem);
-            verify(!backButton.visible, "Back button should not be visible");
-
-            compare(navigationListView.count, 1, "There should be no second-level navigation");
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, false);
-        }
-
-        function test_navigationsClosing() {
-            var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
-            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
-            tryCompare(dashNavigation, "visible", true);
-            var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");
-            verify(dashNavigationButton, "Can't find navigation button");
-            var dashAltNavigationButton = findChild(dashContentList.currentItem, "altNavigationButton");
-            verify(dashAltNavigationButton, "Can't find alternative navigation button");
-
-            waitForRendering(dashNavigationButton);
-            waitForRendering(dashAltNavigationButton);
-
-            compare(dashNavigationButton.showList, false);
-            compare(dashAltNavigationButton.showList, false);
-
-            mouseClick(dashAltNavigationButton);
-            compare(dashNavigationButton.showList, false);
-            compare(dashAltNavigationButton.showList, true);
-
-            var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
-            tryCompareFunction(function() {
-                return navigationListView.currentItem &&
-                       navigationListView.currentItem.navigation &&
-                       navigationListView.currentItem.navigation.loaded; }, true);
-
-            var blackRect = findChild(dashNavigation, "blackRect");
-            tryCompare(blackRect, "opacity", 0.5);
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, false);
-            compare(dashAltNavigationButton.showList, false);
-
-            tryCompare(navigationListView, "visible", false);
-
-            mouseClick(dashNavigationButton);
-            compare(dashNavigationButton.showList, true);
-            compare(dashAltNavigationButton.showList, false);
-
-            navigationListView = findChild(dashNavigationButton, "navigationListView");
-            tryCompare(navigationListView.currentItem.navigation, "loaded", true);
-
-            mouseClick(dashAltNavigationButton);
-            compare(dashNavigationButton.showList, false);
-            compare(dashAltNavigationButton.showList, false);
-        }
-
-        function test_navigationsSwipeToNextScope() {
-            var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
-            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
-            tryCompare(dashNavigation, "visible", true);
-            var dashNavigationButton = findChild(dashContentList.currentItem, "altNavigationButton");
-            verify(dashNavigationButton, "Can't find navigation button");
-
-            compare(dashNavigationButton.showList, false);
-            waitForRendering(dashNavigationButton);
-            mouseClick(dashNavigationButton, 0, 0);
-            compare(dashNavigationButton.showList, true);
-
-            mouseFlick(dashNavigationButton, dashNavigationButton.width - units.gu(1), units.gu(1), units.gu(1), units.gu(1));
-            compare(dashNavigationButton.showList, false);
-
-            var dashContentList = findChild(dashContent, "dashContentList");
-            expectFail("", "should not change the parent list.");
-            tryCompare(dashContentList, "currentIndex", 1);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+            mouseClick(header0);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+        }
+
+        function goToSecondLevel() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+            var searchButton = findChild(dashContentList.currentItem, "search_button");
+            var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
+            compare(peExtraPanel.visible, false);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+
+            var navigationListView = findChild(dashNavigation, "navigationListView");
+            tryCompareFunction(function() {
+                return navigationListView.currentItem &&
+                       navigationListView.currentItem.navigation &&
+                       navigationListView.currentItem.navigation.loaded; }, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            var navigation4 = findChild(dashNavigation, "navigation0child4");
+            mouseClick(navigation4);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle4");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle4");
+            tryCompare(dashNavigation.currentNavigation, "loaded", true);
+
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            var navigation44 = findChild(dashNavigation, "navigation1child4");
+            mouseClick(navigation44);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle44");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "childmiddle44");
+            tryCompare(dashNavigation.currentNavigation, "loaded", true);
+
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            // header 0 is hidden
+            var header0 = findChild(dashNavigation, "dashNavigationHeader0");
+            compare(header0.height, 0);
+        }
+
+        function test_navigationSecondLevelToRoot() {
+            goToSecondLevel();
+
+            var dashContentList = findChild(dashContent, "dashContentList");
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            var navigationListView = findChild(dashNavigation, "navigationListView");
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+
+            // Go directly to the root pressing the back button of header1
+            var header1 = findChild(dashNavigation, "dashNavigationHeader1");
+            compare(header1.backVisible, true);
+            mouseClick(findChild(header1, "backButton"));
+
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+            compare(peExtraPanel.visible, true);
+        }
+
+        function test_navigationSecondLevelToFirstName() {
+            goToSecondLevel();
+
+            var dashContentList = findChild(dashContent, "dashContentList");
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            var navigationListView = findChild(dashNavigation, "navigationListView");
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+
+            // Go directly to the first pressing the header1
+            var header1 = findChild(dashNavigation, "dashNavigationHeader1");
+            mouseClick(header1);
+
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle4");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle4");
+            compare(peExtraPanel.visible, false);
+        }
+
+        function test_navigationSecondLevelToFirstBack() {
+            goToSecondLevel();
+
+            var dashContentList = findChild(dashContent, "dashContentList");
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            var navigationListView = findChild(dashNavigation, "navigationListView");
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+
+            // Go back to the first level pressing the back button of header2
+            var header2 = findChild(dashNavigation, "dashNavigationHeader2");
+            compare(header2.backVisible, true);
+            mouseClick(findChild(header2, "backButton"));
+
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle4");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle4");
+            compare(peExtraPanel.visible, true);
+        }
+
+        function test_clearSearchWithNavigationClosed() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            var searchButton = findChild(dashContentList.currentItem, "search_button");
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+            var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
+
+            compare(peExtraPanel.visible, false);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+
+            typeString("A");
+            compare(peExtraPanel.visible, false);
+
+            var clearIcon = findChild(searchTextField, "clearIcon");
+            mouseClick(clearIcon);
+            tryCompare(peExtraPanel, "visible", true);
+        }
+
+        function test_navigationShowFilterPopup() {
+            goToSecondLevel();
+
+            var dashContentList = findChild(dashContent, "dashContentList");
+            var settingsButton = findChild(dashContentList.currentItem, "settingsButton");
+
+            var filtersPopover = findChild(shell, "filtersPopover")
+            verify(!filtersPopover);
+
+            mouseClick(settingsButton);
+
+            filtersPopover = findChild(shell, "filtersPopover")
+
+            verify(filtersPopover);
+        }
+
+        function test_primaryFilter() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
+            dashContentList.currentItem.item.scope.setHasNavigation(false);
+            var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
+            var searchButton = findChild(dashContentList.currentItem, "search_button");
+
+            compare(peExtraPanel.visible, false);
+            mouseClick(searchButton);
+            tryCompare(peExtraPanel, "visible", true);
+
+            tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3") != null; }, true);
         }
 
         function test_searchHint() {
@@ -540,7 +553,7 @@
             var categoryListView = findChild(scope, "categoryListView");
             waitForRendering(categoryListView);
 
-            compare(categoryListView.pageHeader.item.searchHint, "Search People");
+            compare(categoryListView.pageHeader.searchHint, "Search People");
         }
 
         function compareArrays(a, b) {

=== modified file 'tests/qmltests/Dash/tst_DashPageHeader.qml'
--- tests/qmltests/Dash/tst_DashPageHeader.qml	2015-11-19 16:55:31 +0000
+++ tests/qmltests/Dash/tst_DashPageHeader.qml	2016-03-15 19:17:30 +0000
@@ -18,6 +18,7 @@
 import QtTest 1.0
 import ".."
 import "../../../qml/Dash"
+import "../../../qml/Components/SearchHistoryModel"
 import Ubuntu.Components 1.3
 import Unity 0.2
 import Unity.Test 0.1 as UT
@@ -25,7 +26,7 @@
 Item {
     id: root
     width: units.gu(110)
-    height: units.gu(30)
+    height: units.gu(50)
 
     UT.UnityTestCase {
         name: "PageHeaderLabelTest"
@@ -54,7 +55,7 @@
             pageHeader.searchHistory.clear();
 
             // Check initial state
-            tryCompareFunction(function() { return headerContainer.popover === null; }, true);
+            tryCompare(pageHeader.extraPanel, "visible", false);
             compare(pageHeader.searchHistory.count, 0);
         }
 
@@ -146,7 +147,7 @@
             doResetSearch();
         }
 
-        function test_popover() {
+        function test_extraPanel() {
             searchEnabled = true;
             pageHeader.searchHistory.clear();
 
@@ -155,22 +156,18 @@
 
             pageHeader.triggerSearch();
 
-            var headerContainer = findChild(pageHeader, "headerContainer");
-            verify(headerContainer !== null, "headerContainer != null");
-            tryCompareFunction(function() { return headerContainer.popover !== null; }, true);
-
-            tryCompare(headerContainer.popover, "visible", true);
+            tryCompare(pageHeader.extraPanel, "visible", true);
 
             var searchTextField = findChild(pageHeader, "searchTextField");
             compare(searchTextField.focus, true);
 
-            var recentSearches = findChild(headerContainer.popover, "recentSearches");
-            verify(recentSearches, "Could not find recent searches in the popover");
+            var recentSearches = findChild(pageHeader.extraPanel, "recentSearchesRepeater");
+            verify(recentSearches, "Could not find recent searches");
             waitForRendering(recentSearches);
             mouseClick(recentSearches.itemAt(0));
 
             compare(pageHeader.searchQuery, "Search2");
-            tryCompareFunction(function() { return headerContainer.popover === null; }, true);
+            tryCompare(pageHeader.extraPanel, "visible", false);
             compare(searchTextField.focus, false);
         }
 
@@ -212,9 +209,7 @@
             pageHeader.triggerSearch();
 
             var headerContainer = findChild(pageHeader, "headerContainer");
-            verify(headerContainer !== null, "headerContainer != null");
-            tryCompareFunction(function() { return headerContainer.popover !== null; }, true);
-            compare(headerContainer.popover.visible, true);
+            tryCompare(pageHeader.extraPanel, "visible", true);
 
             pageHeader.searchQuery = data.searchText;
 
@@ -225,7 +220,7 @@
             }
 
             tryCompare(headerContainer, "showSearch", !data.hideSearch);
-            tryCompareFunction(function() { return headerContainer.popover === null; }, true);
+            tryCompare(pageHeader.extraPanel, "visible", false);
 
             doResetSearch();
         }
@@ -251,8 +246,10 @@
                 right: parent.right
             }
 
+            searchHistory: SearchHistoryModel
             searchEntryEnabled: true
             title: "%^$%^%^&%^&%^$%GHR%"
+            extraPanel: peExtraPanel
             scopeStyle: QtObject {
                 readonly property color foreground: theme.palette.normal.baseText
                 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
@@ -264,6 +261,18 @@
             onBackClicked: lastBackClicked = new Date()
         }
 
+        PageHeaderExtraPanel {
+            id: peExtraPanel
+            width: parent.width
+            z: 1
+            visible: false
+            searchHistory: SearchHistoryModel
+            onHistoryItemClicked: {
+                SearchHistoryModel.addQuery(text);
+                pageHeader.searchQuery = text;
+            }
+        }
+
         Row {
             spacing: units.gu(1)
             anchors {

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-02-22 17:07:15 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-03-15 19:17:30 +0000
@@ -428,8 +428,8 @@
 
             function test_header_style_data() {
                 return [
-                    { tag: "Default", index: 0, foreground: UbuntuColors.darkGrey, background: "color:///#f5f5f5", logo: "" },
-                    { tag: "Foreground", index: 1, foreground: "yellow", background: "color:///#f5f5f5", logo: "" },
+                    { tag: "Default", index: 0, foreground: UbuntuColors.darkGrey, background: "color:///#ffffff", logo: "" },
+                    { tag: "Foreground", index: 1, foreground: "yellow", background: "color:///#ffffff", logo: "" },
                     { tag: "Logo+Background", index: 2, foreground: UbuntuColors.darkGrey, background: "gradient:///lightgrey/grey",
                       logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
                 ];
@@ -478,7 +478,7 @@
                 mouseClick(seeAll0);
                 verify(category0.expanded);
                 tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
-                tryCompare(genericScopeView.categoryView, "contentY", units.gu(13));
+                tryCompare(genericScopeView.categoryView, "contentY", units.gu(8));
 
                 scrollToEnd();
 

=== modified file 'tests/qmltests/Dash/tst_PreviewView.qml'
--- tests/qmltests/Dash/tst_PreviewView.qml	2016-02-23 16:30:23 +0000
+++ tests/qmltests/Dash/tst_PreviewView.qml	2016-03-15 19:17:30 +0000
@@ -98,7 +98,7 @@
             var header = findChild(view, "innerPageHeader");
             verify(header, "Could not find the preview header");
 
-            compare(header.config.title, "Mock Scope");
+            compare(header.config.contents.text, "Mock Scope");
         }
 
         function test_header_style() {