Unity 8

Merge lp:~aacid/unity8/optionselector_filter into lp:unity8

optionselector_filter
Merge into trunk

Proposed by Albert Astals Cid on 2015-10-02

Status:	Merged
Approved by:	Andrea Cimitan on 2015-12-18
Approved revision:	2019
Merged at revision:	2296
Proposed branch:	lp:~aacid/unity8/optionselector_filter
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/new_dash_navigation
Diff against target:	1035 lines (+621/-30) 21 files modified qml/Dash/DashNavigation.qml (+1/-1) qml/Dash/DashPageHeader.qml (+36/-16) qml/Dash/Filters/FilterOptionSelector.qml (+89/-0) qml/Dash/Filters/FilterWidget.qml (+29/-0) qml/Dash/Filters/FilterWidgetFactory.qml (+49/-0) qml/Dash/FiltersPopover.qml (+97/-0) qml/Dash/GenericScopeView.qml (+11/-0) qml/Dash/PageHeaderExtraPanel.qml (+20/-2) tests/mocks/Unity/fake_filters.cpp (+17/-3) tests/mocks/Unity/fake_filters.h (+9/-2) tests/mocks/Unity/fake_optionselectorfilter.cpp (+6/-0) tests/mocks/Unity/fake_optionselectorfilter.h (+8/-1) tests/mocks/Unity/fake_optionselectoroptions.cpp (+12/-0) tests/mocks/Unity/fake_optionselectoroptions.h (+5/-0) tests/mocks/Unity/fake_scope.cpp (+20/-4) tests/mocks/Unity/fake_scope.h (+8/-1) tests/mocks/Unity/fake_unity_plugin.cpp (+5/-0) tests/qmltests/CMakeLists.txt (+2/-0) tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml (+96/-0) tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml (+55/-0) tests/qmltests/Dash/tst_DashContent.qml (+46/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/optionselector_filter
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2015-10-02	Approve on 2015-12-18
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-15
Review via email: mp+273194@code.launchpad.net

Commit Message

Filter implementation with Option Selector filter as the only filter

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
Branches from https://requests.ci-train.ubuntu.com/#/ticket/506

* 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?
Not yet

lp:~aacid/unity8/optionselector_filter updated on 2015-10-13

1994. By Albert Astals Cid on 2015-10-13: Implement Scope::activeFiltersCount in the mock plugin
1995. By Albert Astals Cid on 2015-10-13: Number with the active filters

PS Jenkins bot (ps-jenkins) wrote on 2015-10-13:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-13:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-14

1996. By Albert Astals Cid on 2015-10-14: Fix whitespace

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-16

1997. By Albert Astals Cid on 2015-10-16: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-10-16:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-20

1998. By Albert Astals Cid on 2015-10-20: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-10-20:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-22

1999. By Albert Astals Cid on 2015-10-22: Wrap the filters in a flickable

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-22

2000. By Albert Astals Cid on 2015-10-22: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-10-22:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-26

2001. By Albert Astals Cid on 2015-10-23: Merge
2002. By Albert Astals Cid on 2015-10-26: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-10-26:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-10-29

2003. By Albert Astals Cid on 2015-10-29: mege

PS Jenkins bot (ps-jenkins) wrote on 2015-10-29:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-06

2004. By Albert Astals Cid on 2015-11-06: Merge
2005. By Albert Astals Cid on 2015-11-06: Merge
2006. By Albert Astals Cid on 2015-11-06: Merge
2007. By Albert Astals Cid on 2015-11-06: Proper name

PS Jenkins bot (ps-jenkins) wrote on 2015-11-06:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-07:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-12

2008. By Albert Astals Cid on 2015-11-12: Fix import versions

PS Jenkins bot (ps-jenkins) wrote on 2015-11-12:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-16

2009. By Albert Astals Cid on 2015-11-16: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-11-16:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-17:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-18

2010. By Albert Astals Cid on 2015-11-18: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-11-18:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-23

2011. By Albert Astals Cid on 2015-11-23: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-11-23:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-11-23

2012. By Albert Astals Cid on 2015-11-23: Add "Refine your results" + "Reset" to the filter popover

PS Jenkins bot (ps-jenkins) wrote on 2015-11-23:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2015-11-30:

couple of comments for now

review: Needs Fixing

lp:~aacid/unity8/optionselector_filter updated on 2015-11-30

2013. By Albert Astals Cid on 2015-11-30: drop unneeded id
2014. By Albert Astals Cid on 2015-11-30: Better wait for it to check for growth to have stopped

Albert Astals Cid (aacid) wrote on 2015-11-30:

Both fixed

lp:~aacid/unity8/optionselector_filter updated on 2015-11-30

2015. By Albert Astals Cid on 2015-11-30: Merge

Andrea Cimitan (cimi) wrote on 2015-11-30:

Thanks! A couple more

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-12-01

2016. By Albert Astals Cid on 2015-12-01: More reviews fixes

Albert Astals Cid (aacid) wrote on 2015-12-01:

> Thanks! A couple more

Done.

PS Jenkins bot (ps-jenkins) wrote on 2015-12-01:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-12-09

2017. By Albert Astals Cid on 2015-12-09: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-12-09:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-12-14

2018. By Albert Astals Cid on 2015-12-14: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-12-14:

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

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/optionselector_filter updated on 2015-12-15

2019. By Albert Astals Cid on 2015-12-15: Merge

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2015-12-18:

* Did you perform an exploratory manual test run of the code change and any related functionality?
yes, silo 54
* Did CI run pass? If not, please explain why.
unrelated
* Did you make sure that the branch does not contain spurious tags?
y

review: Approve

lp:~aacid/unity8/optionselector_filter updated on 2016-03-14

2020. By Albert Astals Cid on 2016-01-11

Merge

2021. By Albert Astals Cid on 2016-01-13

Merge

2022. By Albert Astals Cid on 2016-01-22

Hide popover when scope stops being current

2023. By Albert Astals Cid on 2016-01-26

Remove clicking on the scope title to trigger search

Was a bug in the prototype i ended up copying ^_^

2024. By Albert Astals Cid on 2016-01-27

Take into account OSK height for limiting the popover height

2025. By Albert Astals Cid on 2016-02-04

Give some space between the popover and the OSK

3gu decided by Patty

2026. By Albert Astals Cid on 2016-02-19

Merge

2027. By Albert Astals Cid on 2016-02-22

Merge

2028. By Albert Astals Cid on 2016-03-03

Merge

2029. By Albert Astals Cid on 2016-03-07

Merge

2030. By Albert Astals Cid on 2016-03-08

Merge

2031. By Albert Astals Cid on 2016-03-14

Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/DashNavigation.qml'
 --- qml/Dash/DashNavigation.qml	2016-03-14 08:53:26 +0000
 +++ qml/Dash/DashNavigation.qml	2016-03-14 08:53:26 +0000
@@ -35,7 +35,7 @@
      property bool isEnteringChildren: false
      visible: height != 0
--    implicitHeight: navigationListView.y + navigationListView.height
++    implicitHeight: scope && scope.hasNavigation ? navigationListView.y + navigationListView.height : 0
      function resetNavigation() {
          if (navigationModel.count > 1) {
 === modified file 'qml/Dash/DashPageHeader.qml'
 --- qml/Dash/DashPageHeader.qml	2016-03-14 08:53:26 +0000
 +++ qml/Dash/DashPageHeader.qml	2016-03-14 08:53:26 +0000
@@ -17,7 +17,6 @@
  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"
@@ -27,6 +26,8 @@
      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
@@ -54,6 +55,7 @@
      signal settingsClicked()
      signal favoriteClicked()
      signal searchTextFieldFocused()
++    signal showFiltersPopup(var item)
      onScopeStyleChanged: refreshLogo()
      onSearchQueryChanged: {
@@ -204,29 +206,47 @@
                              rightMargin: units.gu(1)
+                         }
++                        readonly property bool clearIsSettings: !searchTextField.focus && root.scopeHasFilters
++
                          primaryItem: Label {
                              text: root.navigationTag
+                         }
--                        secondaryItem: AbstractButton {
++                        secondaryItem: Row {
                              height: searchTextField.height
--                            width: height
--                            enabled: searchTextField.text.length > 0 || root.navigationTag != ""
--
--                            Image {
--                                objectName: "clearIcon"
--                                anchors.fill: parent
--                                anchors.margins: units.gu(.75)
--                                source: "image://theme/clear"
--                                opacity: parent.enabled
--                                visible: opacity > 0
--                                Behavior on opacity {
--                                    UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
++
++                            AbstractButton {
++                                id: clearOrSettingsButton
++                                height: parent.height
++                                width: height
++                                enabled: searchTextField.text.length > 0 || root.navigationTag != ""
++
++                                Image {
++                                    objectName: "clearIcon"
++                                    anchors.fill: parent
++                                    anchors.margins: units.gu(.75)
++                                    source: searchTextField.clearIsSettings ? "image://theme/settings" : "image://theme/clear"
++                                    opacity: parent.enabled
++                                    visible: opacity > 0
++                                    Behavior on opacity {
++                                        UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
++                                    }
++                                }
++
++                                onClicked: {
++                                    if (searchTextField.clearIsSettings) {
++                                        root.showFiltersPopup(clearOrSettingsButton);
++                                    } else {
++                                        root.clearSearch(true);
++                                    }
+                                 }
+                             }
--                            onClicked: {
--                                root.clearSearch(true);
++                            Label {
++                                visible: searchTextField.clearIsSettings && root.activeFiltersCount > 0
++                                height: parent.height
++                                text: root.activeFiltersCount
++                                verticalAlignment: Text.AlignVCenter
+                             }
+                         }
 === 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-14 08:53:26 +0000
@@ -0,0 +1,89 @@
++/*
++ * 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
++
++        onClicked: {
++            expanded = !expanded;
++        }
++
++        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/FilterWidget.qml'
 --- qml/Dash/Filters/FilterWidget.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Filters/FilterWidget.qml	2016-03-14 08:53:26 +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
++
++    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-14 08:53:26 +0000
@@ -0,0 +1,49 @@
++/*
++ * 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 Unity 0.2
++
++//! \brief This component loads the widgets based on widgetType.
++
++Loader {
++    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
++
++    source: widgetSource
++
++    //! \cond private
++    readonly property url widgetSource: {
++        switch (widgetType) {
++            case Filters.OptionSelectorFilter: return "FilterOptionSelector.qml";
++            default: return "";
++        }
++    }
++    //! \endcond
++
++    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-14 08:53:26 +0000
@@ -0,0 +1,97 @@
++/*
++ * 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 "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));
++        }
++        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 {
++                model: scopeView.scope.filters
++
++                delegate: Filters.FilterWidgetFactory {
++                    width: parent.width
++
++                    widgetId: id
++                    widgetType: type
++                    widgetData: filter
++                }
++            }
++        }
++    }
++}
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2016-03-14 08:53:26 +0000
 +++ qml/Dash/GenericScopeView.qml	2016-03-14 08:53:26 +0000
@@ -16,6 +16,7 @@
  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
@@ -42,6 +43,7 @@
      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 : {}
@@ -121,6 +123,10 @@
+         }
          categoryView.pageHeader.resetSearch();
          subPageLoader.closeSubPage();
++        if (filtersPopover) {
++            PopupUtils.close(filtersPopover)
++            scopeView.filtersPopover = null;
++        }
+     }
      Binding {
@@ -619,6 +625,8 @@
              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
@@ -642,6 +650,9 @@
                      openPopup();
+                 }
+             }
++            onShowFiltersPopup: { // item
++                scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
++            }
+         }
          PageHeaderExtraPanel {
 === modified file 'qml/Dash/PageHeaderExtraPanel.qml'
 --- qml/Dash/PageHeaderExtraPanel.qml	2016-03-14 08:53:26 +0000
 +++ qml/Dash/PageHeaderExtraPanel.qml	2016-03-14 08:53:26 +0000
@@ -17,13 +17,14 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3
++import "Filters" as Filters
  Item {
      id: root
      readonly property real searchesHeight: recentSearchesRepeater.count > 0 ? searchColumn.height + recentSearchesLabels.height + recentSearchesLabels.anchors.margins : 0
--    implicitHeight: searchesHeight + dashNavigation.implicitHeight
++    implicitHeight: searchesHeight + dashNavigation.implicitHeight + primaryFilter.height
      // Set by parent
      property ListModel searchHistory
@@ -32,7 +33,7 @@
      property real windowHeight
      // Used by PageHeader
--    readonly property bool hasContents: searchHistory.count > 0 || scope && scope.hasNavigation
++    readonly property bool hasContents: searchHistory.count > 0 || scope && scope.hasNavigation || scope && scope.primaryNavigationFilter
      signal historyItemClicked(string text)
      signal dashNavigationLeafClicked()
@@ -111,6 +112,23 @@
          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
++            left: parent.left
++            right: parent.right
++        }
++
++        widgetId: filter ? filter.filterId : ""
++        widgetType: filter ? filter.filterType : -1
++        widgetData: filter
++    }
++
      // This is outside the item
      Image {
          anchors {
 === modified file 'tests/mocks/Unity/fake_filters.cpp'
 --- tests/mocks/Unity/fake_filters.cpp	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_filters.cpp	2016-03-14 08:53:26 +0000
@@ -22,9 +22,14 @@
  Filters::Filters(Scope* parent)
   : unity::shell::scopes::FiltersInterface(parent)
+ {
--    auto optionFilter1 = new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this);
--    auto optionFilter2 = new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this);
--    m_filters << optionFilter1 << optionFilter2;
++    addFilter(new FakeOptionSelectorFilter("OSF1", "Tag1", "Which Cake you like More", false, QStringList() << "cheese" << "carrot" << "chocolate", this));
++    addFilter(new FakeOptionSelectorFilter("OSF2", "Tag2", "Which Countries have you been to?", true, QStringList() << "Germany" << "UK" << "New Zealand", this));
++}
++
++void Filters::addFilter(FakeOptionSelectorFilter *f)
++{
++    connect(f, &FakeOptionSelectorFilter::isActiveChanged, this, &Filters::activeFiltersCountChanged);
++    m_filters << f;
+ }
  int Filters::rowCount(const QModelIndex &parent) const
@@ -54,3 +59,12 @@
              return QVariant();
+     }
+ }
++
++int Filters::activeFiltersCount() const
++{
++    int active = 0;
++    Q_FOREACH(FakeOptionSelectorFilter *f, m_filters) {
++        if (f->isActive()) ++active;
++    }
++    return active;
++}
 === modified file 'tests/mocks/Unity/fake_filters.h'
 --- tests/mocks/Unity/fake_filters.h	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_filters.h	2016-03-14 08:53:26 +0000
@@ -18,9 +18,9 @@
  #define FAKE_FILTERS_H
  #include <unity/shell/scopes/FiltersInterface.h>
--#include <unity/shell/scopes/FilterBaseInterface.h>
  class Scope;
++class FakeOptionSelectorFilter;
  class Filters : public unity::shell::scopes::FiltersInterface
+ {
@@ -32,8 +32,15 @@
      int rowCount(const QModelIndex &parent) const override;
      QVariant data(const QModelIndex &index, int role) const override;
++    int activeFiltersCount() const;
++
++Q_SIGNALS:
++    void activeFiltersCountChanged();
++
  private:
--    QVector<unity::shell::scopes::FilterBaseInterface*> m_filters;
++    void addFilter(FakeOptionSelectorFilter* f);
++
++    QVector<FakeOptionSelectorFilter*> m_filters;
  };
  #endif
 === modified file 'tests/mocks/Unity/fake_optionselectorfilter.cpp'
 --- tests/mocks/Unity/fake_optionselectorfilter.cpp	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_optionselectorfilter.cpp	2016-03-14 08:53:26 +0000
@@ -26,6 +26,7 @@
     m_multiSelect(multiselect)
+ {
      m_options = new FakeOptionSelectorOptions(optionLabels, this);
++    connect(m_options, &FakeOptionSelectorOptions::anyCheckedChanged, this, &FakeOptionSelectorFilter::isActiveChanged);
+ }
  QString FakeOptionSelectorFilter::filterId() const
@@ -57,3 +58,8 @@
+ {
      return m_options;
+ }
++
++bool FakeOptionSelectorFilter::isActive() const
++{
++    return m_options->anyChecked();
++}
 === modified file 'tests/mocks/Unity/fake_optionselectorfilter.h'
 --- tests/mocks/Unity/fake_optionselectorfilter.h	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_optionselectorfilter.h	2016-03-14 08:53:26 +0000
@@ -19,6 +19,8 @@
  #include <unity/shell/scopes/OptionSelectorFilterInterface.h>
++class FakeOptionSelectorOptions;
++
  class FakeOptionSelectorFilter : public unity::shell::scopes::OptionSelectorFilterInterface
+ {
      Q_OBJECT
@@ -33,13 +35,18 @@
      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;
--    unity::shell::scopes::OptionSelectorOptionsInterface* m_options;
++    FakeOptionSelectorOptions* m_options;
  };
  #endif
 === modified file 'tests/mocks/Unity/fake_optionselectoroptions.cpp'
 --- tests/mocks/Unity/fake_optionselectoroptions.cpp	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_optionselectoroptions.cpp	2016-03-14 08:53:26 +0000
@@ -56,10 +56,22 @@
  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();
+ }
 === modified file 'tests/mocks/Unity/fake_optionselectoroptions.h'
 --- tests/mocks/Unity/fake_optionselectoroptions.h	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_optionselectoroptions.h	2016-03-14 08:53:26 +0000
@@ -34,6 +34,11 @@
      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;
 === modified file 'tests/mocks/Unity/fake_scope.cpp'
 --- tests/mocks/Unity/fake_scope.cpp	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_scope.cpp	2016-03-14 08:53:26 +0000
@@ -21,6 +21,7 @@
  #include "fake_filters.h"
  #include "fake_navigation.h"
++#include "fake_optionselectorfilter.h"
  #include "fake_resultsmodel.h"
  #include "fake_scopes.h"
  #include "fake_settingsmodel.h"
@@ -38,6 +39,8 @@
      , m_searching(false)
      , m_favorite(favorite)
      , m_isActive(false)
++    , m_hasNavigation(true)
++    , m_hasPrimaryFilter(true)
      , m_currentNavigationId("root")
      , m_previewRendererName("preview-generic")
      , m_categories(new Categories(categories, this))
@@ -46,6 +49,8 @@
      , 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
@@ -230,7 +235,13 @@
  bool Scope::hasNavigation() const
+ {
--    return true;
++    return m_hasNavigation;
++}
++
++void Scope::setHasNavigation(bool hasNavigation)
++{
++    m_hasNavigation = hasNavigation;
++    Q_EMIT hasNavigationChanged();
+ }
  Scope::Status Scope::status() const
@@ -303,7 +314,7 @@
  unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const
+ {
--    return nullptr;
++    return m_hasPrimaryFilter ? m_primaryNavigationFilter : nullptr;
+ }
  unity::shell::scopes::FiltersInterface* Scope::filters() const
@@ -321,8 +332,7 @@
  int Scope::activeFiltersCount() const
+ {
--    // TODO
--    return 0;
++    return m_filters->activeFiltersCount();
+ }
  void Scope::resetPrimaryNavigationTag()
@@ -332,6 +342,12 @@
+     }
+ }
++void Scope::setHasPrimaryFilter(bool hasPrimaryFilter)
++{
++    m_hasPrimaryFilter = hasPrimaryFilter;
++    Q_EMIT primaryNavigationFilterChanged();
++}
++
  void Scope::performQuery(const QString& query)
+ {
      Q_EMIT queryPerformed(query);
 === modified file 'tests/mocks/Unity/fake_scope.h'
 --- tests/mocks/Unity/fake_scope.h	2016-03-14 08:53:26 +0000
 +++ tests/mocks/Unity/fake_scope.h	2016-03-14 08:53:26 +0000
@@ -24,7 +24,9 @@
  #include <QTimer>
++class Filters;
  class Scopes;
++class FakeOptionSelectorFilter;
  class Scope : public unity::shell::scopes::ScopeInterface
+ {
@@ -70,12 +72,14 @@
      bool hasNavigation() const  override;
      Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) 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;
@@ -105,6 +109,8 @@
      bool m_searching;
      bool m_favorite;
      bool m_isActive;
++    bool m_hasNavigation;
++    bool m_hasPrimaryFilter;
      QString m_currentNavigationId;
      QString m_previewRendererName;
@@ -112,7 +118,8 @@
      unity::shell::scopes::CategoriesInterface* m_categories;
      unity::shell::scopes::ScopeInterface* m_openScope;
      unity::shell::scopes::SettingsModelInterface* m_settings;
--    unity::shell::scopes::FiltersInterface* m_filters;
++    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-14 08:53:26 +0000
@@ -22,7 +22,9 @@
  // 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"
@@ -52,4 +54,7 @@
      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 Filters object in QML. Get them from OptionSelector instance.");
+ }
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2016-03-10 22:41:38 +0000
 +++ tests/qmltests/CMakeLists.txt	2016-03-14 08:53:26 +0000
@@ -53,6 +53,8 @@
  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 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-14 08:53:26 +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_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-14 08:53:26 +0000
@@ -0,0 +1,55 @@
++/*
++ * 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" }
++            ];
++        }
++
++        function test_mapping(data) {
++            factory.widgetData = {};
++            factory.widgetType = data.type;
++
++            verify((String(factory.source)).indexOf(data.source) != -1);
++        }
++    }
++}
 === modified file 'tests/qmltests/Dash/tst_DashContent.qml'
 --- tests/qmltests/Dash/tst_DashContent.qml	2016-03-14 08:53:26 +0000
 +++ tests/qmltests/Dash/tst_DashContent.qml	2016-03-14 08:53:26 +0000
@@ -513,6 +513,52 @@
              tryCompare(peExtraPanel, "visible", true);
+         }
++        function test_navigationShowFilterButton() {
++            goToSecondLevel();
++
++            var dashContentList = findChild(dashContent, "dashContentList");
++            var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
++
++            verify(!searchTextField.focus)
++            verify(searchTextField.clearIsSettings)
++
++            mouseClick(searchTextField)
++
++            verify(searchTextField.focus)
++            verify(!searchTextField.clearIsSettings)
++        }
++
++        function test_navigationShowFilterPopup() {
++            goToSecondLevel();
++
++            var dashContentList = findChild(dashContent, "dashContentList");
++            var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
++            var clearIcon = findChild(searchTextField, "clearIcon");
++
++            var filtersPopover = findChild(shell, "filtersPopover")
++            verify(!filtersPopover);
++
++            mouseClick(clearIcon);
++
++            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_action_button");
++
++            compare(peExtraPanel.visible, false);
++            mouseClick(searchButton);
++            tryCompare(peExtraPanel, "visible", true);
++
++            tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3") != null; }, true);
++        }
++
          function test_searchHint() {
              var dashContentList = findChild(dashContent, "dashContentList");
              verify(dashContentList !== null);