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

[Albert Astals Cid]

Pass the scope search hint up to the search line

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~unity-team/unity-scopes-shell/catch-no-search-hint/+merge/228288
No, but there is a crash somewhere in scopes plugin that makes it crash for some scopes and also we have a white on white text problem, so it eihter needs the SDK team to fix the color on SuruDark or the Dash being a separate app so we can not use SuruDark theme

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, changed hint color of /usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/TextField.qml to be red manually and it is showing up fine

 * 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?
This is requested by design

[Michael Zanetti (mzanetti)]

I think we could add a simple test here to make sure the value from the scope ends up in the placeholderText.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

Otherwise it works fine except the above mentioned issues. I tried to merge it into the dash-as-app branch but that makes me hit the mentioned crash.

[lp:~aacid/unity8/scopeSearchHintText]

1082. By Albert Astals Cid on 2014-07-25

Check the searchhint travels up correcly through the layers

[Albert Astals Cid (aacid)]

> I think we could add a simple test here to make sure the value from the scope
> ends up in the placeholderText.

Added.

[lp:~aacid/unity8/scopeSearchHintText]

1083. By Albert Astals Cid on 2014-07-25

Merge

[Michael Zanetti (mzanetti)]

thanks. looks good.

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

yeah man!

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

CI? what's that?

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1081
http://jenkins.qa.ubuntu.com/job/unity8-ci/3601/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/695
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/695
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10427

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1081
http://jenkins.qa.ubuntu.com/job/unity8-ci/3615/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/709
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/709/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/709
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3784
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10485

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/scopeSearchHintText]

1084. By Albert Astals Cid on 2014-07-28

Merge

1085. By Albert Astals Cid on 2014-07-29

Merge lp:~aacid/unity8/scopeActivatePreview

1086. By Albert Astals Cid on 2014-07-30

Merge

1087. By Albert Astals Cid on 2014-07-30

Merge

1088. By Albert Astals Cid on 2014-07-31

Merge

1089. By Albert Astals Cid on 2014-08-01

Merge

1090. By Albert Astals Cid on 2014-08-05

Merge

1091. By Albert Astals Cid on 2014-08-06

Merge

1092. By Albert Astals Cid on 2014-08-06

Merge

1093. By Albert Astals Cid on 2014-08-07

Merge

1094. By Albert Astals Cid on 2014-08-07

Merge

1095. By Albert Astals Cid on 2014-08-08

Merge

Unmerged revisions

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2014-07-16 15:51:56 +0000
+++ data/unity8.conf	2014-07-29 11:27:22 +0000
@@ -36,7 +36,7 @@
 
     if [ -z "$UNITY_SCOPES_LIST" ]; then
         # FIXME: remove once we have this in dconf
-        initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+        initctl set-env UNITY_SCOPES_LIST="clickscope;musicaggregator;videoaggregator"
     fi
 
     # Remove the socket if still there
 
=== modified file 'debian/control'
--- debian/control	2014-07-24 20:40:44 +0000
+++ debian/control	2014-07-29 11:27:22 +0000
@@ -23,7 +23,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.85),
+               libunity-api-dev (>= 7.87),
                libunity-mir-dev,
                libusermetricsoutput1-dev,
                libxcb1-dev,
 
=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-07-09 19:44:44 +0000
+++ plugins/Dash/CardCreator.js	2014-07-29 11:27:22 +0000
@@ -408,7 +408,7 @@
         mascotCode = kMascotImageCode.arg(anchors).arg(mascotImageVisible);
     }
 
-    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey")';
+    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < (root.scopeStyle ? root.scopeStyle.threshold : 0.7) ? (root.scopeStyle ? root.scopeStyle.light : "white") : (root.scopeStyle ? root.scopeStyle.dark : "grey")';
 
     var titleSubtitleCode = "";
     if (hasTitle) {
@@ -438,6 +438,7 @@
                 titleAnchors = 'left: parent.left; \n\
                                 leftMargin: units.gu(1); \n\
                                 right: parent.right; \n\
+                                rightMargin: units.gu(1); \n\
                                 top: overlayLoader.top; \n\
                                 topMargin: units.gu(1);\n';
             } else {
 
=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-07-18 18:09:13 +0000
+++ plugins/Dash/ScopeStyle.qml	2014-07-29 11:27:22 +0000
@@ -43,9 +43,9 @@
 
     /*! \brief Luminance threshold for switching between fore and background color
 
-        \note If background colour is not fully opaque, it's not taken into account.
+        \note If background colour is not fully opaque, the defaultLightLuminance it's taken into account instead of it.
      */
-    readonly property real threshold: background.a !== 1.0 ? d.foregroundLuminance : (d.foregroundLuminance + d.backgroundLuminance) / 2
+    readonly property real threshold: background.a !== 1.0 ? (d.foregroundLuminance + d.defaultLightLuminance) / 2: (d.foregroundLuminance + d.backgroundLuminance) / 2
 
     /*! \brief The lighter of foreground and background colors
 
 
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2014-07-25 10:47:08 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2014-07-29 11:27:22 +0000
@@ -822,8 +822,8 @@
                 ListItem *nextItem = itemAtIndex(modelIndex + 1);
                 if (nextItem) {
                     listItem->setY(nextItem->y() - listItem->height());
-                } else if (modelIndex == 0 && m_headerItem) {
-                    listItem->setY(m_headerItem->height());
+                } else if (modelIndex == 0) {
+                    listItem->setY(m_headerItem ? m_headerItem->height() : 0);
                 } else if (!m_visibleItems.isEmpty()) {
                     lostItem = true;
                 }
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-07-11 14:20:12 +0000
+++ po/unity8.pot	2014-07-29 11:27:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-11 14:59+0200\n"
+"POT-Creation-Date: 2014-07-21 15:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -101,7 +101,7 @@
 msgid "See more"
 msgstr ""
 
-#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
+#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:356
 msgid "See less"
 msgstr ""
 
@@ -109,7 +109,7 @@
 msgid "Recent"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:330
+#: qml/Dash/GenericScopeView.qml:356
 msgid "See all"
 msgstr ""
 
@@ -133,6 +133,22 @@
 msgid "Send"
 msgstr ""
 
+#: qml/Dash/ScopesOverview.qml:185
+msgid "Manage Dash"
+msgstr ""
+
+#: qml/Dash/ScopesOverview.qml:390
+msgid "Done"
+msgstr ""
+
+#: qml/Dash/ScopesOverviewTab.qml:36
+msgid "Favorites"
+msgstr ""
+
+#: qml/Dash/ScopesOverviewTab.qml:54
+msgid "All"
+msgstr ""
+
 #: qml/Greeter/Greeter.qml:157
 msgid "Swipe to unlock"
 msgstr ""
@@ -157,11 +173,11 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:91
+#: qml/Notifications/NotificationMenuItemFactory.qml:97
 msgid "Show password"
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:103
+#: qml/Notifications/NotificationMenuItemFactory.qml:112
 msgid "Please enter SIM PIN"
 msgstr ""
 
@@ -173,27 +189,27 @@
 msgid "Conference"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:583
+#: qml/Panel/Indicators/MenuItemFactory.qml:577
 msgid "In queue…"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:587
+#: qml/Panel/Indicators/MenuItemFactory.qml:581
 msgid "Downloading"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:589
+#: qml/Panel/Indicators/MenuItemFactory.qml:583
 msgid "Paused, tap to resume"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:591
+#: qml/Panel/Indicators/MenuItemFactory.qml:585
 msgid "Canceled"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:593
+#: qml/Panel/Indicators/MenuItemFactory.qml:587
 msgid "Finished"
 msgstr ""
 
-#: qml/Panel/Indicators/MenuItemFactory.qml:595
+#: qml/Panel/Indicators/MenuItemFactory.qml:589
 msgid "Failed, tap to retry"
 msgstr ""
 
@@ -201,7 +217,23 @@
 msgid "Search"
 msgstr ""
 
-#: qml/Shell.qml:359
+#: qml/Shell.qml:347
+msgid "Are you sure you would like to turn power off?"
+msgstr ""
+
+#: qml/Shell.qml:349
+msgid "Power off"
+msgstr ""
+
+#: qml/Shell.qml:360
+msgid "Restart"
+msgstr ""
+
+#: qml/Shell.qml:369
+msgid "Cancel"
+msgstr ""
+
+#: qml/Shell.qml:496
 #, qt-format
 msgid "Please enter %1"
 msgstr ""
 
=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-07-21 09:49:41 +0000
+++ qml/Components/PageHeader.qml	2014-07-29 11:27:22 +0000
@@ -24,7 +24,7 @@
 Item {
     id: root
     objectName: "pageHeader"
-    implicitHeight: headerContainer.height + units.gu(2) + bottomContainer.height
+    implicitHeight: headerContainer.height + bottomContainer.height + (showSignatureLine ? units.gu(2) : 0)
 
     property bool showBackButton: false
     property string title
@@ -32,7 +32,9 @@
     property bool searchEntryEnabled: false
     property ListModel searchHistory: SearchHistoryModel
     property alias searchQuery: searchTextField.text
+    property alias searchHint: searchTextField.placeholderText
     property bool searchInProgress: false
+    property alias showSignatureLine: bottomBorder.visible
 
     property alias bottomItem: bottomContainer.children
 
@@ -44,6 +46,12 @@
     signal backClicked()
 
     onScopeStyleChanged: refreshLogo()
+    onSearchQueryChanged: {
+        // Make sure we are at the search page if the search query changes behind our feet
+        if (searchQuery) {
+            headerContainer.showSearch = true;
+        }
+    }
 
     function triggerSearch() {
         if (searchEntryEnabled) {
@@ -52,6 +60,12 @@
         }
     }
 
+    function closePopup() {
+        if (headerContainer.popover != null) {
+            PopupUtils.close(headerContainer.popover);
+        }
+    }
+
     function resetSearch(keepFocus) {
         if (searchHistory) {
             searchHistory.addQuery(searchTextField.text);
@@ -60,9 +74,7 @@
             unfocus();
         }
         searchTextField.text = "";
-        if (headerContainer.popover != null) {
-            PopupUtils.close(headerContainer.popover);
-        }
+        closePopup();
     }
 
     function unfocus() {
@@ -103,9 +115,7 @@
         anchors { fill: parent; margins: units.gu(1); bottomMargin: units.gu(3) + bottomContainer.height }
         visible: headerContainer.showSearch
         onPressed: {
-            if (headerContainer.popover) {
-                PopupUtils.close(headerContainer.popover);
-            }
+            closePopup();
             if (!searchTextField.text) {
                 headerContainer.showSearch = false;
             }
@@ -220,6 +230,12 @@
                             root.openSearchHistory();
                         }
                     }
+
+                    onTextChanged: {
+                        if (text != "") {
+                            closePopup();
+                        }
+                    }
                 }
             }
 
@@ -244,6 +260,7 @@
 
                     actions: [
                         Action {
+                            objectName: "search"
                             iconName: "search"
                             visible: root.searchEntryEnabled
                             onTriggered: {
@@ -296,6 +313,7 @@
 
                 Repeater {
                     id: recentSearches
+                    objectName: "recentSearches"
                     model: searchHistory
 
                     delegate: Standard {
@@ -304,7 +322,8 @@
                         onClicked: {
                             searchHistory.addQuery(text);
                             searchTextField.text = text;
-                            PopupUtils.close(popover);
+                            closePopup();
+                            unfocus();
                         }
                     }
                 }
 
=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-07-11 12:12:50 +0000
+++ qml/Components/ResponsiveGridView.qml	2014-07-29 11:27:22 +0000
@@ -34,7 +34,7 @@
     readonly property int cellWidth: gridView.cellWidth
     readonly property int cellHeight: gridView.cellHeight
     readonly property int totalContentHeight: {
-        return contentHeightForRows(Math.ceil(gridView.model.count / columns))
+        return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)
     }
     property alias interactive: gridView.interactive
     readonly property alias flicking: gridView.flicking
@@ -47,8 +47,8 @@
     property alias cacheBuffer: gridView.cacheBuffer
     readonly property alias currentItem: gridView.currentItem
 
-    function contentHeightForRows(rows) {
-        return rows * cellHeight;
+    function contentHeightForRows(rows, height) {
+        return rows * height
     }
 
     GridView {
 
=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2014-07-11 12:13:08 +0000
+++ qml/Dash/CardCarousel.qml	2014-07-29 11:27:22 +0000
@@ -48,8 +48,8 @@
 
             objectName: "carouselDelegate" + index
 
-            function clicked() { cardCarousel.clicked(index, model.result) }
-            function pressAndHold() { cardCarousel.pressAndHold(index, model.result) }
+            function clicked() { cardCarousel.clicked(index, model.result, loader.item, model) }
+            function pressAndHold() { cardCarousel.pressAndHold(index, model) }
 
             sourceComponent: cardTool.cardComponent
             onLoaded: {
 
=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2014-07-18 11:35:47 +0000
+++ qml/Dash/CardGrid.qml	2014-07-29 11:27:22 +0000
@@ -26,10 +26,20 @@
     }
 
     expandedHeight: grid.totalContentHeight
-    collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows), expandedHeight)
+    collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
     collapsedItemCount: collapsedRows * grid.columns
     originY: grid.originY
 
+    function cardPosition(index) {
+        var pos = {};
+        var row = Math.floor(index / grid.columns);
+        var column = index % grid.columns;
+        // Bit sad this is not symmetrical
+        pos.x = column * grid.cellWidth + grid.margins;
+        pos.y = row * grid.cellHeight;
+        return pos;
+    }
+
     ResponsiveGridView {
         id: grid
         anchors.fill: parent
@@ -53,6 +63,7 @@
                     item.objectName = "delegate" + index;
                     item.width = Qt.binding(function() { return cardTool.cardWidth; });
                     item.height = Qt.binding(function() { return cardTool.cardHeight; });
+                    item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
                     item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
                     item.cardData = Qt.binding(function() { return model; });
                     item.template = Qt.binding(function() { return cardTool.template; });
@@ -62,8 +73,8 @@
                 }
                 Connections {
                     target: loader.item
-                    onClicked: root.clicked(index, result)
-                    onPressAndHold: root.pressAndHold(index)
+                    onClicked: root.clicked(index, result, loader.item, model)
+                    onPressAndHold: root.pressAndHold(index, model)
                 }
             }
         }
 
=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2014-07-22 12:17:34 +0000
+++ qml/Dash/CardVerticalJournal.qml	2014-07-29 11:27:22 +0000
@@ -61,8 +61,8 @@
             }
             Connections {
                 target: loader.item
-                onClicked: root.clicked(index, result)
-                onPressAndHold: root.pressAndHold(index)
+                onClicked: root.clicked(index, result, loader.item, model)
+                onPressAndHold: root.pressAndHold(index, model)
             }
         }
     }
 
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-07-07 08:20:04 +0000
+++ qml/Dash/Dash.qml	2014-07-29 11:27:22 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Gestures 0.1
 import Unity 0.2
 import Utils 0.1
 import "../Components"
@@ -29,6 +30,8 @@
     property string showScopeOnLoaded: "clickscope"
     property real contentScale: 1.0
 
+    property alias overviewHandleHeight: overviewDragHandle.height
+
     function setCurrentScope(scopeId, animate, reset) {
         var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
 
@@ -66,19 +69,85 @@
         filterRegExp: RegExp("^true$")
     }
 
+    QtObject {
+        id: overviewController
+        objectName: "overviewController"
+
+        property alias enableAnimation: progressAnimation.enabled
+        property real progress: 0
+        Behavior on progress {
+            id: progressAnimation
+            UbuntuNumberAnimation { }
+        }
+    }
+
+    ScopesOverview {
+        id: scopesOverview
+        objectName: "scopesOverview"
+        anchors.fill: parent
+        scope: scopes.overviewScope
+        progress: overviewController.progress
+        scopeScale: scopeItem.scope ? 0.4 : (1 - overviewController.progress * 0.6)
+        visible: scopeScale != 1
+        currentIndex: dashContent.currentIndex
+        onDone: {
+            if (currentTab == 1) {
+                animateDashFromAll(dashContent.currentScopeId);
+            }
+            hide();
+        }
+        onFavoriteSelected: {
+            setCurrentScope(scopeId, false, false);
+            hide();
+        }
+        onAllFavoriteSelected: {
+            setCurrentScope(scopeId, false, false);
+            animateDashFromAll(dashContent.currentScopeId);
+            hide();
+        }
+        onSearchSelected: {
+            var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId);
+            if (scopeIndex >= 0) {
+                // Is a favorite one
+                setCurrentScope(scopeId, false, false);
+                showDashFromPos(pos, size);
+                hide();
+            } else {
+                // Is not a favorite one, activate and get openScope
+                scope.activate(result);
+            }
+        }
+        function hide() {
+            overviewController.enableAnimation = true;
+            overviewController.progress = 0;
+        }
+        onProgressChanged: {
+            if (progress == 0) {
+                currentTab = scopeItem.scope ? 1 : 0;
+            }
+        }
+    }
+
     DashContent {
         id: dashContent
+
+        property var scopeThatOpenedScope: null
+
+        parent: overviewController.progress == 0 ? dash : scopesOverview.dashItemEater
         objectName: "dashContent"
-        width: parent.width
-        height: parent.height
+        width: dash.width
+        height: dash.height
         model: filteredScopes
         scopes: scopes
-        visible: x != -width
+        visible: !scopesOverview.showingNonFavoriteScope && x != -width
         onGotoScope: {
             dash.setCurrentScope(scopeId, true, false);
         }
         onOpenScope: {
+            scopeThatOpenedScope = currentScope;
             scopeItem.scope = scope;
+            scopesOverview.currentTab = 1;
+            scopesOverview.ensureAllScopeVisible(scope.id);
             x = -width;
         }
         onScopeLoaded: {
@@ -88,25 +157,63 @@
             }
         }
         scale: dash.contentScale
-        clip: scale != 1.0 || scopeItem.visible
+        clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0
         Behavior on x {
             UbuntuNumberAnimation {
+                duration: overviewController.progress != 0 ? 0 : UbuntuAnimation.FastDuration
                 onRunningChanged: {
                     if (!running && dashContent.x == 0) {
-                        dashContent.closeScope(scopeItem.scope);
+                        dashContent.scopeThatOpenedScope.closeScope(scopeItem.scope);
                         scopeItem.scope = null;
+                        if (overviewController.progress == 0) {
+                            // Set tab to Favorites only if we are not showing the overview
+                            scopesOverview.currentTab = 0;
+                        }
                     }
                 }
             }
         }
+
+        enabled: opacity == 1
+        opacity: scopesOverview.growingDashFromPos ? 1 : 1 - overviewController.progress
+    }
+
+    DashBackground
+    {
+        anchors.fill: scopeItem
+        visible: scopeItem.visible
+        parent: scopeItem.parent
+        scale: scopeItem.scale
+        opacity: scopeItem.opacity
     }
 
     GenericScopeView {
         id: scopeItem
-        anchors.left: dashContent.right
+        objectName: "dashTempScopeItem"
+
+        readonly property real targetOverviewScale: {
+            if (scopesOverview.currentTab == 0) {
+                return 0.4;
+            } else {
+                return scopesOverview.allCardSize.width / scopeItem.width;
+            }
+        }
+        readonly property real overviewProgressScale: (1 - overviewController.progress * (1 - targetOverviewScale))
+        readonly property var targetOverviewPosition: scope ? scopesOverview.allScopeCardPosition(scope.id) : null
+        readonly property real overviewProgressX: scope && scopesOverview.currentTab == 1 && targetOverviewPosition ?
+                                                      overviewController.progress * (targetOverviewPosition.x - (width - scopesOverview.allCardSize.width) / 2)
+                                                      : 0
+        readonly property real overviewProgressY: scope && scopesOverview.currentTab == 1 && targetOverviewPosition ?
+                                                      overviewController.progress * (targetOverviewPosition.y - (height - scopesOverview.allCardSize.height) / 2)
+                                                      : 0
+
+        x: overviewController.progress == 0 ? dashContent.x + width : overviewProgressX
+        y: overviewController.progress == 0 ? dashContent.y : overviewProgressY
         width: parent.width
         height: parent.height
-        scale: dash.contentScale
+        scale: dash.contentScale * overviewProgressScale
+        enabled: opacity == 1
+        opacity: 1 - overviewController.progress
         clip: scale != 1.0
         visible: scope != null
         hasBackAction: true
@@ -126,4 +233,28 @@
             }
         }
     }
+
+    EdgeDragArea {
+        id: overviewDragHandle
+        objectName: "overviewDragHandle"
+        z: 1
+        direction: Direction.Upwards
+        enabled: !dashContent.previewShown && dashContent.currentScope && dashContent.currentScope.searchQuery == "" && (overviewController.progress == 0 || dragging)
+
+        readonly property real fullMovement: units.gu(20)
+
+        anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
+        height: units.gu(2)
+
+        onSceneDistanceChanged: {
+            overviewController.enableAnimation = false;
+            overviewController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
+        }
+
+        onDraggingChanged: {
+            overviewController.enableAnimation = true;
+            overviewController.progress = (overviewController.progress > 0.7)  ? 1 : 0;
+        }
+    }
+
 }
 
=== added file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/DashBackground.qml	2014-07-29 11:27:22 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013, 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Image {
+    source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
+    fillMode: Image.PreserveAspectCrop
+    horizontalAlignment: Image.AlignRight
+    verticalAlignment: Image.AlignTop
+}
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-07-08 19:35:59 +0000
+++ qml/Dash/DashContent.qml	2014-07-29 11:27:22 +0000
@@ -26,6 +26,9 @@
     property var model: null
     property var scopes: null
     readonly property alias currentIndex: dashContentList.currentIndex
+    readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
+    readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
+    readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ? dashContentList.currentItem.item.previewShown : false
 
     signal scopeLoaded(string scopeId)
     signal gotoScope(string scopeId)
@@ -76,15 +79,15 @@
         }
     }
 
-    function closeScope(scope) {
-        dashContentList.currentItem.theScope.closeScope(scope)
-    }
-
     Item {
         id: dashContentListHolder
 
         anchors.fill: parent
 
+        DashBackground {
+            anchors.fill: parent
+        }
+
         ListView {
             id: dashContentList
             objectName: "dashContentList"
 
=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2014-07-22 12:17:34 +0000
+++ qml/Dash/DashRenderer.qml	2014-07-29 11:27:22 +0000
@@ -41,9 +41,12 @@
     /// Emitted when the user clicked on an item
     /// @param index is the index of the clicked item
     /// @param result result model of the cliked item, used for activation
-    signal clicked(int index, var result)
+    /// @param item item that has been clicked
+    /// @param itemModel model of the item
+    signal clicked(int index, var result, var item, var itemModel)
 
     /// Emitted when the user pressed and held on an item
     /// @param index is the index of the held item
-    signal pressAndHold(int index)
+    /// @param itemModel model of the item
+    signal pressAndHold(int index, var itemModel)
 }
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-24 20:40:44 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-29 11:27:22 +0000
@@ -33,6 +33,10 @@
     property bool hasBackAction: false
     property bool enableHeightBehaviorOnNextCreation: false
     property var categoryView: categoryView
+    property bool showPageHeader: true
+    property var clickOverride: null
+    property var pressAndHoldOverride: null
+    readonly property alias previewShown: previewListView.open
 
     property var scopeStyle: ScopeStyle {
         style: scope ? scope.customizations : {}
@@ -78,22 +82,24 @@
     }
 
     onIsCurrentChanged: {
-        pageHeader.resetSearch();
+        if (showPageHeader) {
+            pageHeaderLoader.item.resetSearch();
+        }
         previewListView.open = false;
     }
 
     Binding {
         target: scopeView.scope
         property: "searchQuery"
-        value: pageHeader.searchQuery
-        when: isCurrent
+        value: pageHeaderLoader.item ? pageHeaderLoader.item.searchQuery : ""
+        when: isCurrent && showPageHeader
     }
 
     Binding {
-        target: pageHeader
+        target: pageHeaderLoader.item
         property: "searchQuery"
         value: scopeView.scope ? scopeView.scope.searchQuery : ""
-        when: isCurrent
+        when: isCurrent && showPageHeader
     }
 
     Connections {
@@ -232,7 +238,12 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: {
-                        if (scopeView.scope.id === "scopes" || scopeView.scope.id == "clickscope") {
+                        if (scopeView.clickOverride) {
+                            scopeView.clickOverride(index, result, item, itemModel);
+                            return;
+                        }
+
+                        if (itemModel.uri.indexOf("scope://") === 0 || scopeView.scope.id === "clickscope") {
                             // TODO Technically it is possible that calling activate() will make the scope emit
                             // previewRequested so that we show a preview but there's no scope that does that yet
                             // so it's not implemented
@@ -241,7 +252,16 @@
                             openPreview(index);
                         }
                     }
-                    onPressAndHold: openPreview(index)
+
+                    onPressAndHold: {
+                        if (scopeView.pressAndHoldOverride) {
+                            scopeView.pressAndHoldOverride(index);
+                        } else {
+                            if (itemModel.uri.indexOf("scope://") !== 0) {
+                                openPreview(index)
+                            }
+                        }
+                    }
 
                     function openPreview(index) {
                         if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {
@@ -389,26 +409,35 @@
             }
         }
 
-        pageHeader: PageHeader {
-            id: pageHeader
-            objectName: "scopePageHeader"
+        pageHeader: scopeView.showPageHeader ? pageHeaderLoader : null
+        Loader {
+            id: pageHeaderLoader
             width: parent.width
-            title: scopeView.scope ? scopeView.scope.name : ""
-            showBackButton: scopeView.hasBackAction
-            searchEntryEnabled: true
-            searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false
-            scopeStyle: scopeView.scopeStyle
-
-            bottomItem: DashDepartments {
-                scope: scopeView.scope
-                width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
-                anchors.right: parent.right
-                windowHeight: scopeView.height
-                windowWidth: scopeView.width
-                scopeStyle: scopeView.scopeStyle
+            sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
+            Component {
+                id: pageHeaderComponent
+                PageHeader {
+                    objectName: "scopePageHeader"
+                    width: parent.width
+                    title: scopeView.scope ? scopeView.scope.name : ""
+                    searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.tr("Search")
+                    showBackButton: scopeView.hasBackAction
+                    searchEntryEnabled: true
+                    searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false
+                    scopeStyle: scopeView.scopeStyle
+
+                    bottomItem: DashDepartments {
+                        scope: scopeView.scope
+                        width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
+                        anchors.right: parent.right
+                        windowHeight: scopeView.height
+                        windowWidth: scopeView.width
+                        scopeStyle: scopeView.scopeStyle
+                    }
+
+                    onBackClicked: scopeView.backClicked()
+                }
             }
-
-            onBackClicked: scopeView.backClicked()
         }
     }
 
@@ -427,7 +456,9 @@
         anchors.left: categoryView.right
 
         onOpenChanged: {
-            pageHeader.unfocus();
+            if (showPageHeader) {
+                pageHeaderLoader.item.unfocus();
+            }
         }
     }
 
 
=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-07-17 13:10:45 +0000
+++ qml/Dash/PreviewListView.qml	2014-07-29 11:27:22 +0000
@@ -88,7 +88,7 @@
             height: previewListView.height
             width: previewListView.width
 
-            readonly property bool ready: preview.previewModel.loaded
+            readonly property bool ready: preview.previewModel && preview.previewModel.loaded
 
             Previews.Preview {
                 id: preview
@@ -108,7 +108,7 @@
                 id: processingMouseArea
                 objectName: "processingMouseArea"
                 anchors.fill: parent
-                enabled: !preview.previewModel.loaded || preview.previewModel.processingAction
+                enabled: preview.previewModel && (!preview.previewModel.loaded || preview.previewModel.processingAction)
 
                 ActivityIndicator {
                     anchors.centerIn: parent
 
=== added file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverview.qml	2014-07-29 11:27:22 +0000
@@ -0,0 +1,518 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Dash 0.1
+import Ubuntu.Components 0.1
+import "../Components"
+
+Item {
+    id: root
+
+    // Properties set by parent
+    property real progress: 0
+    property var scope: null
+    property int currentIndex: 0
+    property real scopeScale: 1
+
+    // Properties set and used by parent
+    property alias currentTab: tabBar.currentTab
+
+    // Properties used by parent
+    property bool growingDashFromPos: false
+    readonly property bool searching: scope && scope.searchQuery == ""
+    readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
+    readonly property var dashItemEater: {
+        if (!forceXYScalerEater && tabBar.currentTab == 0 && middleItems.count > 0) {
+            var loaderItem = middleItems.itemAt(0).item;
+            return loaderItem && loaderItem.currentItem ? loaderItem.currentItem : null;
+        }
+        return scopesOverviewXYScaler;
+    }
+    readonly property size allCardSize: {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var cardTool = loaderItem.cardTool;
+                return Qt.size(cardTool.cardWidth, cardTool.cardHeight);
+            }
+        }
+        return Qt.size(0, 0);
+    }
+
+    // Internal properties
+    property bool forceXYScalerEater: false
+
+    signal done()
+    signal favoriteSelected(var scopeId)
+    signal allFavoriteSelected(var scopeId)
+    signal searchSelected(var scopeId, var result, var pos, var size)
+
+    Connections {
+        target: scope
+        onOpenScope: {
+            var itemPos = scopesOverviewXYScaler.restorePosition;
+            var itemSize = scopesOverviewXYScaler.restoreSize;
+            scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
+            if (itemPos) {
+                scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
+                scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
+            } else {
+                scopesOverviewXYScaler.x = 0;
+                scopesOverviewXYScaler.y = 0;
+            }
+            scopesOverviewXYScaler.opacity = 0;
+            tempScopeItem.scope = scope;
+            middleItems.overrideOpacity = 0;
+            scopesOverviewXYScaler.scale = 1;
+            scopesOverviewXYScaler.x = 0;
+            scopesOverviewXYScaler.y = 0;
+            scopesOverviewXYScaler.opacity = 1;
+        }
+    }
+
+    function animateDashFromAll(scopeId) {
+        var currentScopePos = allScopeCardPosition(scopeId);
+        if (currentScopePos) {
+            showDashFromPos(currentScopePos, allCardSize);
+        } else {
+            console.log("Warning: Could not find Dash OverView All card position for scope", dashContent.currentScopeId);
+        }
+    }
+
+    function showDashFromPos(itemPos, itemSize) {
+        scopesOverviewXYScaler.scale = itemSize.width / scopesOverviewXYScaler.width;
+        scopesOverviewXYScaler.x = itemPos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;
+        scopesOverviewXYScaler.y = itemPos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;
+        scopesOverviewXYScaler.opacity = 0;
+        root.growingDashFromPos = true;
+        scopesOverviewXYScaler.scale = 1;
+        scopesOverviewXYScaler.x = 0;
+        scopesOverviewXYScaler.y = 0;
+        scopesOverviewXYScaler.opacity = 1;
+    }
+
+    function allScopeCardPosition(scopeId) {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var pos = loaderItem.scopeCardPosition(scopeId);
+                return loaderItem.mapToItem(null, pos.x, pos.y);
+            }
+        }
+    }
+
+    function ensureAllScopeVisible(scopeId) {
+        if (middleItems.count > 1) {
+            var loaderItem = middleItems.itemAt(1).item;
+            if (loaderItem) {
+                var pos = loaderItem.scopeCardPosition(scopeId);
+                loaderItem.contentY = Math.min(pos.y, loaderItem.contentHeight - loaderItem.height);
+            }
+        }
+    }
+
+    onProgressChanged: {
+        if (progress == 0) {
+            pageHeader.resetSearch();
+            pageHeader.unfocus(); // Shouldn't the previous call do this too?
+        }
+    }
+
+    ScopeStyle {
+        id: overviewScopeStyle
+        style: { "foreground-color" : "white", "background-color" : "transparent" }
+    }
+
+    DashBackground {
+        anchors.fill: parent
+        source: "graphics/dark_background.jpg"
+    }
+
+    Connections {
+        target: pageHeader
+        onSearchQueryChanged: {
+            // Need this in order, otherwise something gets unhappy in rendering
+            // of the overlay in carousels because the parent of the dash dies for
+            // a moment, this way we make sure it's reparented first
+            // by forceXYScalerEater making dashItemEater return scopesOverviewXYScaler
+            // before we kill the previous parent by scope.searchQuery
+            root.forceXYScalerEater = true;
+            root.scope.searchQuery = pageHeader.searchQuery;
+            root.forceXYScalerEater = false;
+        }
+    }
+
+    Binding {
+        target: pageHeader
+        property: "searchQuery"
+        value: scope ? scope.searchQuery : ""
+    }
+
+    Item {
+        id: scopesOverviewContent
+        x: previewListView.open ? -width : 0
+        Behavior on x { UbuntuNumberAnimation { } }
+        width: parent.width
+        height: parent.height
+
+        PageHeader {
+            id: pageHeader
+            objectName: "scopesOverviewPageHeader"
+
+            readonly property real yDisplacement: pageHeader.height + tabBar.height + tabBar.anchors.margins
+
+            y: {
+                if (root.progress < 0.5) {
+                    return -yDisplacement;
+                } else {
+                    return -yDisplacement + (root.progress - 0.5) * yDisplacement * 2;
+                }
+            }
+            width: parent.width
+            clip: true
+            title: i18n.tr("Manage Dash")
+            scopeStyle: overviewScopeStyle
+            showSignatureLine: false
+            searchEntryEnabled: true
+            searchInProgress: root.scope ? root.scope.searchInProgress : false
+        }
+
+        ScopesOverviewTab {
+            id: tabBar
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: pageHeader.bottom
+                margins: units.gu(2)
+            }
+            height: units.gu(4)
+
+            enabled: opacity == 1
+            opacity: !scope || scope.searchQuery == "" ? 1 : 0
+            Behavior on opacity { UbuntuNumberAnimation { } }
+        }
+
+        Repeater {
+            id: middleItems
+            objectName: "scopesOverviewRepeater"
+            property real overrideOpacity: -1
+            model: scope && scope.searchQuery == "" ? scope.categories : null
+            delegate: Loader {
+                id: loader
+                objectName: "scopesOverviewRepeaterChild" + index
+
+                height: {
+                    if (index == 0) {
+                        return root.height;
+                    } else {
+                        return root.height - pageHeader.height - tabBar.height - tabBar.anchors.margins - units.gu(2)
+                    }
+                }
+                width: {
+                    if (index == 0) {
+                        return root.width / scopeScale
+                    } else {
+                        return root.width
+                    }
+                }
+                x: {
+                    if (index == 0) {
+                        return (root.width - width) / 2;
+                    } else {
+                        return 0;
+                    }
+                }
+                anchors {
+                    bottom: scopesOverviewContent.bottom
+                }
+
+                scale: index == 0 ? scopeScale : 1
+
+                opacity: {
+                    if (middleItems.overrideOpacity >= 0)
+                        return middleItems.overrideOpacity;
+
+                    if (tabBar.currentTab != index)
+                        return 0;
+
+                    return index == 0 ? 1 : root.progress;
+                }
+                Behavior on opacity {
+                    enabled: root.progress == 1
+                    UbuntuNumberAnimation { }
+                }
+                enabled: opacity == 1
+
+                clip: index == 1
+
+                CardTool {
+                    id: cardTool
+                    objectName: "cardTool"
+                    count: results.count
+                    template: model.renderer
+                    components: model.components
+                    viewWidth: parent.width
+                }
+
+                source: {
+                    if (index == 0 && categoryId == "favorites") return "ScopesOverviewFavorites.qml";
+                    else if (index == 1 && categoryId == "all") return "ScopesOverviewAll.qml";
+                    else return "";
+                }
+
+                onLoaded: {
+                    item.model = Qt.binding(function() { return results })
+                    item.cardTool = cardTool;
+                    if (index == 0) {
+                        item.scopeWidth = Qt.binding(function() { return root.width; });
+                        item.scopeHeight = Qt.binding(function() { return root.height; });
+                        item.appliedScale = Qt.binding(function() { return loader.scale });
+                        item.currentIndex = Qt.binding(function() { return root.currentIndex });
+                    } else if (index == 1) {
+                        item.extraHeight = bottomBar.height;
+                    }
+                }
+
+                Connections {
+                    target: loader.item
+                    onClicked: {
+                        if (tabBar.currentTab == 0) {
+                            root.favoriteSelected(itemModel.scopeId)
+                        } else {
+                            var favoriteScopesItem = middleItems.itemAt(0).item;
+                            var scopeIndex = favoriteScopesItem.model.scopeIndex(itemModel.scopeId);
+                            if (scopeIndex >= 0) {
+                                root.allFavoriteSelected(itemModel.scopeId);
+                            } else {
+                                // Will result in an openScope from root.scope
+                                scopesOverviewXYScaler.restorePosition = item.mapToItem(null, 0, 0);
+                                scopesOverviewXYScaler.restoreSize = allCardSize;
+                                root.scope.activate(result);
+                            }
+                        }
+                    }
+                    onPressAndHold: {
+                        // Preview can call openScope so make sure restorePosition and restoreSize are set
+                        scopesOverviewXYScaler.restorePosition = undefined;
+                        scopesOverviewXYScaler.restoreSize = allCardSize;
+
+                        previewListView.model = target.model;
+                        previewListView.currentIndex = -1
+                        previewListView.currentIndex = index;
+                        previewListView.open = true
+                    }
+                }
+            }
+        }
+
+        GenericScopeView {
+            id: searchResultsViewer
+            objectName: "searchResultsViewer"
+            anchors {
+                top: pageHeader.bottom
+                right: parent.right
+                left: parent.left
+                bottom: parent.bottom
+            }
+            scope: root.scope && root.scope.searchQuery != "" ? root.scope : null
+            scopeStyle: overviewScopeStyle
+            enabled: opacity == 1
+            showPageHeader: false
+            clip: true
+            opacity: searchResultsViewer.scope ? 1 : 0
+            Behavior on opacity { UbuntuNumberAnimation { } }
+
+            clickOverride: function (index, result, item, itemModel) {
+                pageHeader.closePopup();
+                if (itemModel.scopeId) {
+                    // This can end up in openScope so save restorePosition and restoreSize
+                    scopesOverviewXYScaler.restorePosition = item.mapToItem(null, 0, 0);
+                    scopesOverviewXYScaler.restoreSize = Qt.size(item.width, item.height);
+                    root.searchSelected(itemModel.scopeId, result, item.mapToItem(null, 0, 0), Qt.size(item.width, item.height));
+                } else {
+                    // Not a scope, just activate it
+                    searchResultsViewer.scope.activate(result);
+                }
+            }
+
+            pressAndHoldOverride: function (index) {
+                // Do nothing
+            }
+        }
+
+        Rectangle {
+            id: bottomBar
+            color: "black"
+            height: units.gu(6)
+            width: parent.width
+            enabled: opacity == 0.4
+            opacity: scope && scope.searchQuery == "" ? 0.4 : 0
+            Behavior on opacity { UbuntuNumberAnimation { } }
+            y: {
+                if (root.progress < 0.5) {
+                    return parent.height;
+                } else {
+                    return parent.height - (root.progress - 0.5) * height * 2;
+                }
+            }
+
+            AbstractButton {
+                objectName: "scopesOverviewDoneButton"
+                width: Math.max(label.width + units.gu(2), units.gu(10))
+                height: units.gu(4)
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                Rectangle {
+                    anchors.fill: parent
+                    border.color: "white"
+                    border.width: units.dp(1)
+                    radius: units.dp(10)
+                    color: parent.pressed ? "gray" : "transparent"
+                }
+                Label {
+                    id: label
+                    anchors.centerIn: parent
+                    text: i18n.tr("Done")
+                    color: parent.pressed ? "black" : "white"
+                }
+                onClicked: root.done();
+            }
+
+            AbstractButton {
+                objectName: "scopesOverviewStoreButton"
+                width: Math.max(storeLabel.width, units.gu(10))
+                height: units.gu(4)
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+                Image {
+                    id: storeImage
+                    source: "graphics/apps-scope.png"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    fillMode: Image.Stretch
+                }
+                Label {
+                    id: storeLabel
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.top: storeImage.bottom
+                    text: i18n.tr("Store")
+                    color: "white"
+                }
+                onClicked: {
+                    // Just zoom from the middle
+                    scopesOverviewXYScaler.restorePosition = undefined;
+                    scopesOverviewXYScaler.restoreSize = allCardSize;
+                    scope.performQuery("scope://com.canonical.scopes.clickstore");
+                }
+            }
+        }
+    }
+
+    PreviewListView {
+        id: previewListView
+        objectName: "scopesOverviewPreviewListView"
+        scope: root.scope
+        scopeStyle: overviewScopeStyle
+        visible: x != width
+        width: parent.width
+        height: parent.height
+        anchors.left: scopesOverviewContent.right
+    }
+
+
+
+    Item {
+        id: scopesOverviewXYScaler
+        width: parent.width
+        height: parent.height
+
+        clip: scale != 1.0
+        enabled: scale == 1
+
+        property bool animationsEnabled: root.showingNonFavoriteScope || root.growingDashFromPos
+
+        property var restorePosition
+        property var restoreSize
+
+        Behavior on x {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on y {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on opacity {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation { }
+        }
+        Behavior on scale {
+            enabled: scopesOverviewXYScaler.animationsEnabled
+            UbuntuNumberAnimation {
+                onRunningChanged: {
+                    if (!running) {
+                        if (root.showingNonFavoriteScope && scopesOverviewXYScaler.scale != 1) {
+                            root.scope.closeScope(tempScopeItem.scope);
+                            tempScopeItem.scope = null;
+                        } else if (root.growingDashFromPos) {
+                            root.growingDashFromPos = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        DashBackground
+        {
+            anchors.fill: tempScopeItem
+            visible: tempScopeItem.visible
+            parent: tempScopeItem.parent
+        }
+
+        GenericScopeView {
+            id: tempScopeItem
+            objectName: "scopesOverviewTempScopeItem"
+
+            width: parent.width
+            height: parent.height
+            scale: dash.contentScale
+            clip: scale != 1.0
+            visible: scope != null
+            hasBackAction: true
+            isCurrent: visible
+            onBackClicked: {
+                var v = scopesOverviewXYScaler.restoreSize.width / tempScopeItem.width;
+                scopesOverviewXYScaler.scale = v;
+                if (scopesOverviewXYScaler.restorePosition) {
+                    scopesOverviewXYScaler.x = scopesOverviewXYScaler.restorePosition.x -(tempScopeItem.width - tempScopeItem.width * v) / 2;
+                    scopesOverviewXYScaler.y = scopesOverviewXYScaler.restorePosition.y -(tempScopeItem.height - tempScopeItem.height * v) / 2;
+                } else {
+                    scopesOverviewXYScaler.x = 0;
+                    scopesOverviewXYScaler.y = 0;
+                }
+                scopesOverviewXYScaler.opacity = 0;
+                middleItems.overrideOpacity = -1;
+            }
+        }
+    }
+}
 
=== added file 'qml/Dash/ScopesOverviewAll.qml'
--- qml/Dash/ScopesOverviewAll.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewAll.qml	2014-07-29 11:27:22 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Flickable {
+    id: root
+
+    property alias model: cardGrid.model
+    property alias cardTool: cardGrid.cardTool
+
+    property real extraHeight: 0
+
+    signal clicked(int index, var result, var item, var itemModel)
+    signal pressAndHold(int index)
+
+    contentHeight: cardGrid.expandedHeight + extraHeight
+    contentWidth: cardGrid.width
+    flickableDirection: Flickable.VerticalFlick
+
+    function scopeCardPosition(scopeId) {
+        var index = model.scopeIndex(scopeId);
+        var pos = cardGrid.cardPosition(index);
+        pos.y = pos.y - root.contentY;
+        return pos;
+    }
+
+    CardGrid {
+        id: cardGrid
+        width: root.width
+        height: parent.height
+
+        onClicked: {
+            root.clicked(index, result, item, itemModel);
+        }
+        onPressAndHold: {
+            root.pressAndHold(index);
+        }
+    }
+}
 
=== added file 'qml/Dash/ScopesOverviewFavorites.qml'
--- qml/Dash/ScopesOverviewFavorites.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewFavorites.qml	2014-07-29 11:27:22 +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.0
+
+Flickable {
+    id: root
+
+    signal clicked(int index, var result, var itemModel)
+    signal pressAndHold(int index)
+
+    property var cardTool: null
+    property real scopeHeight: 0
+    property real scopeWidth: 0
+    property real appliedScale: 1
+    property int currentIndex: -1
+    property var currentItem: repeater.itemAt(currentIndex);
+
+    property alias model: repeater.model
+
+    contentHeight: height
+    contentWidth: repeater.count * root.scopeWidth + units.gu(2) / appliedScale * (repeater.count - 1)
+
+    contentX: {
+        var indexX = currentIndex * scopeWidth + units.gu(2) / appliedScale * currentIndex;
+        var newContentX = indexX - (width - scopeWidth) / 2;
+        newContentX = Math.min(Math.max(newContentX, 0), contentWidth - width);
+        return newContentX;
+    }
+
+    Repeater {
+        id: repeater
+        objectName: "scopesOverviewFavoritesRepeater"
+
+        delegate: Loader {
+            id: loader
+
+            x: index * root.scopeWidth + units.gu(2) / appliedScale * index
+            asynchronous: true
+
+            sourceComponent: cardTool.cardComponent
+            onLoaded: {
+                item.fixedArtShapeSize = Qt.binding(function() { return Qt.size(root.scopeWidth, root.scopeHeight); });
+                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight / appliedScale; });
+                item.fontScale = Qt.binding(function() { return 1 / appliedScale; });
+                item.height = Qt.binding(function() { return root.scopeHeight; });
+                item.width = Qt.binding(function() { return root.scopeWidth; });
+                item.cardData = Qt.binding(function() { return model; });
+                item.template = Qt.binding(function() { return cardTool.template; });
+                item.components = Qt.binding(function() { return cardTool.components; });
+                item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });
+            }
+
+            Connections {
+                target: loader.item
+                onClicked: root.clicked(index, result, model)
+            }
+        }
+    }
+}
 
=== added file 'qml/Dash/ScopesOverviewTab.qml'
--- qml/Dash/ScopesOverviewTab.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopesOverviewTab.qml	2014-07-29 11:27:22 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    property int currentTab: 0
+
+    AbstractButton {
+        id: tab1
+        height: parent.height
+        width: parent.width / 2
+        Rectangle {
+            anchors.fill: parent
+            color: root.currentTab == 0 && root.enabled ? "white" : "transparent"
+            radius: units.dp(10)
+        }
+        Label {
+            anchors.centerIn: parent
+            text: i18n.tr("Favorites")
+            color: root.currentTab == 0 && root.enabled ? "black" : "white"
+        }
+        onClicked: root.currentTab = 0
+    }
+    AbstractButton {
+        id: tab2
+        objectName: "scopesOverviewAllTabButton"
+        x: width
+        height: parent.height
+        width: parent.width / 2
+        Rectangle {
+            anchors.fill: parent
+            color: root.currentTab == 1 && root.enabled ? "white" : "transparent"
+            radius: units.dp(10)
+        }
+        Label {
+            anchors.centerIn: parent
+            text: i18n.tr("All")
+            color: root.currentTab == 1 && root.enabled ? "black" : "white"
+        }
+        onClicked: root.currentTab = 1
+    }
+    Rectangle {
+        id: centerPiece
+        width: root.enabled ? units.dp(10) : units.dp(1)
+        height: parent.height
+        color: "white"
+        x: root.currentTab == 1 ? tab2.x : tab2.x - width
+    }
+    Rectangle {
+        id: border
+        anchors.fill: parent
+        radius: units.dp(10)
+        color: "transparent"
+        border.color: centerPiece.color
+        border.width: units.dp(1)
+    }
+}
 
=== added file 'qml/Dash/graphics/apps-scope.png'
 Binary files qml/Dash/graphics/apps-scope.png	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/apps-scope.png	2014-07-29 11:27:22 +0000 differ
=== added file 'qml/Dash/graphics/dark_background.jpg'
 Binary files qml/Dash/graphics/dark_background.jpg	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/dark_background.jpg	2014-07-29 11:27:22 +0000 differ
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-07-18 15:13:35 +0000
+++ qml/Shell.qml	2014-07-29 11:27:22 +0000
@@ -125,14 +125,6 @@
                 opacity: dash.disappearingAnimationProgress
             }
 
-            Image {
-                anchors.fill: dash
-                source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
-                fillMode: Image.PreserveAspectCrop
-                horizontalAlignment: Image.AlignRight
-                verticalAlignment: Image.AlignTop
-            }
-
             Dash {
                 id: dash
                 objectName: "dash"
@@ -142,6 +134,8 @@
                 shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
                 enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
 
+                overviewHandleHeight: shell.edgeSize
+
                 anchors {
                     fill: parent
                     topMargin: panel.panelHeight
 
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-07-25 10:47:19 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-07-29 11:27:22 +0000
@@ -18,6 +18,7 @@
 #
 
 import logging
+import time
 import ubuntuuitoolkit
 
 from unity8.shell import emulators
@@ -68,7 +69,9 @@
 
         """
         scope_loader = self._get_scope_loader(scope_id)
+        print ("open_scope", scope_id, scope_loader)
         if scope_loader.isCurrent:
+            print ("scope_loader.isCurrent")
             logger.info('The scope is already open.')
             return self._get_scope_from_loader(scope_loader)
         else:
@@ -83,6 +86,12 @@
                 'No scope found with id {0}'.format(scope_id))
 
     def _get_scope_from_loader(self, loader):
+        print ("_get_scope_from_loader", loader, loader.isCurrent, loader.isLoaded, loader.get_children())
+        i = 0
+        time.sleep(1)
+        while len(loader.get_children()) < 1 and i < 5:
+            time.sleep(1)
+            i = i + 1
         return loader.get_children()[0]
 
     def _open_scope_scrolling(self, scope_loader):
 
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2014-07-08 09:23:14 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2014-07-29 11:27:22 +0000
@@ -6,7 +6,7 @@
 pkg_search_module(DEE dee-1.0 REQUIRED)
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -21,6 +21,7 @@
 set(UnityQML_SOURCES
   fake_scope.cpp
   fake_scopes.cpp
+  fake_scopesoverview.cpp
   fake_categories.cpp
   fake_department.cpp
   fake_resultsmodel.cpp
 
=== modified file 'tests/mocks/Unity/fake_resultsmodel.cpp'
--- tests/mocks/Unity/fake_resultsmodel.cpp	2014-05-20 10:29:20 +0000
+++ tests/mocks/Unity/fake_resultsmodel.cpp	2014-07-29 11:27:22 +0000
@@ -58,8 +58,9 @@
         case RoleUri:
         case RoleCategoryId:
         case RoleDndUri:
+            return QString();
         case RoleResult:
-            return QString();
+            return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());
         case RoleTitle:
             return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());
         case RoleArt:
 
=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-07-24 20:40:57 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-07-29 11:27:22 +0000
@@ -14,17 +14,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QDebug>
 #include <QUrl>
 
 #include "fake_scope.h"
+
 #include "fake_department.h"
 #include "fake_resultsmodel.h"
+#include "fake_scopes.h"
 
-Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)
+Scope::Scope(Scopes* parent) : Scope(QString(), QString(), false, parent)
 {
 }
 
-Scope::Scope(QString const& id, QString const& name, bool visible, QObject* parent, int categories)
+Scope::Scope(QString const& id, QString const& name, bool visible, Scopes* parent, int categories)
     : unity::shell::scopes::ScopeInterface(parent)
     , m_id(id)
     , m_name(name)
@@ -34,6 +37,7 @@
     , m_currentDeparment("root")
     , m_previewRendererName("preview-generic")
     , m_categories(new Categories(categories, this))
+    , m_openScope(nullptr)
 {
 }
 
@@ -64,7 +68,7 @@
 
 QString Scope::searchHint() const
 {
-    return QString("");
+    return QString("Search %1").arg(m_name);
 }
 
 QString Scope::shortcut() const
@@ -149,7 +153,12 @@
 
 void Scope::activate(QVariant const& result)
 {
-    Q_UNUSED(result);
+    qDebug() << "Called activate on scope" << m_id << "with result" << result;
+    if (result.toString() == "Result.2.2") {
+        Scopes *scopes = dynamic_cast<Scopes*>(parent());
+        m_openScope = scopes->getScopeFromAll("MockScope9");
+        Q_EMIT openScope(m_openScope);
+    }
 }
 
 PreviewStack* Scope::preview(QVariant const& result)
@@ -165,9 +174,13 @@
 {
 }
 
-void Scope::closeScope(unity::shell::scopes::ScopeInterface* /*scope*/)
+void Scope::closeScope(unity::shell::scopes::ScopeInterface* scope)
 {
-    qFatal("Scope::closeScope is not implemented");
+    if (scope != m_openScope) {
+        qDebug() << scope << m_openScope;
+        qFatal("Scope::closeScope got wrong scope in closeScope");
+    }
+    m_openScope = nullptr;
 }
 
 QString Scope::currentDepartmentId() const
 
=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-07-11 16:39:33 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-07-29 11:27:22 +0000
@@ -24,13 +24,15 @@
 
 #include <QTimer>
 
+class Scopes;
+
 class Scope : public unity::shell::scopes::ScopeInterface
 {
     Q_OBJECT
 
 public:
-    Scope(QObject* parent = 0);
-    Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0, int categories = 20);
+    Scope(Scopes* parent = 0);
+    Scope(QString const& id, QString const& name, bool visible, Scopes* parent = 0, int categories = 20);
 
     /* getters */
     QString id() const override;
@@ -84,7 +86,8 @@
 
     QString m_previewRendererName;
 
-    Categories* m_categories;
+    unity::shell::scopes::CategoriesInterface* m_categories;
+    unity::shell::scopes::ScopeInterface* m_openScope;
 };
 
 #endif // FAKE_SCOPE_H
 
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2014-07-11 11:45:45 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2014-07-29 11:27:22 +0000
@@ -18,6 +18,7 @@
 
 // Self
 #include "fake_scopes.h"
+#include "fake_scopesoverview.h"
 
 // TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)
 
@@ -26,6 +27,7 @@
 
 Scopes::Scopes(QObject *parent)
  : unity::shell::scopes::ScopesInterface(parent)
+ , m_scopesOverview(nullptr)
  , m_loaded(false)
  , timer(this)
 {
@@ -47,10 +49,17 @@
     addScope(new Scope("clickscope", "Apps", true, this));
     addScope(new Scope("MockScope5", "Videos", true, this));
     addScope(new Scope("SingleCategoryScope", "Single", true, this, 1));
+    addScope(new Scope("MockScope4", "MS4", true, this));
+    addScope(new Scope("MockScope6", "MS6", true, this));
+    addScope(new Scope("MockScope7", "MS7", false, this));
+    addScope(new Scope("MockScope8", "MS8", false, this));
+    addScope(new Scope("MockScope9", "MS9", false, this));
+    m_scopesOverview = new ScopesOverview(this);
 
     if (!m_loaded) {
         m_loaded = true;
         Q_EMIT loadedChanged();
+        Q_EMIT overviewScopeChanged();
     }
 }
 
@@ -63,6 +72,8 @@
         m_scopes.clear();
         endRemoveRows();
     }
+    delete m_scopesOverview;
+    m_scopesOverview = nullptr;
 
     if (m_loaded) {
         m_loaded = false;
@@ -110,8 +121,22 @@
     return m_scopes[row];
 }
 
-unity::shell::scopes::ScopeInterface* Scopes::getScope(QString const&) const
-{
+unity::shell::scopes::ScopeInterface* Scopes::getScope(QString const &scope_id) const
+{
+    for (Scope *scope : m_scopes) {
+        // According to mh3 Scopes::getScope should only return non null for visible scopes
+        if (scope->id() == scope_id && scope->visible())
+            return scope;
+    }
+    return nullptr;
+}
+
+unity::shell::scopes::ScopeInterface* Scopes::getScopeFromAll(const QString& scope_id) const
+{
+    for (Scope *scope : m_scopes) {
+        if (scope->id() == scope_id)
+            return scope;
+    }
     return nullptr;
 }
 
@@ -125,6 +150,22 @@
     return m_loaded;
 }
 
+unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const
+{
+    return m_scopesOverview;
+}
+
+QList<unity::shell::scopes::ScopeInterface *> Scopes::scopes(bool onlyVisible) const
+{
+    QList<unity::shell::scopes::ScopeInterface *> res;
+    for (Scope *scope : m_scopes) {
+        if (!onlyVisible || scope->visible()) {
+            res << scope;
+        }
+    }
+    return res;
+}
+
 void Scopes::addScope(Scope* scope)
 {
     int index = rowCount();
 
=== modified file 'tests/mocks/Unity/fake_scopes.h'
--- tests/mocks/Unity/fake_scopes.h	2014-05-20 14:48:08 +0000
+++ tests/mocks/Unity/fake_scopes.h	2014-07-29 11:27:22 +0000
@@ -50,12 +50,18 @@
     QModelIndex parent ( const QModelIndex & index ) const;
 
     bool loaded() const override;
+    unity::shell::scopes::ScopeInterface* overviewScope() const override;
+
+    // This is used as part of implementation of the other C++ code, not API
+    QList<unity::shell::scopes::ScopeInterface *> scopes(bool onlyVisible) const;
+    unity::shell::scopes::ScopeInterface* getScopeFromAll(const QString& scope_id) const;
 
 private Q_SLOTS:
     void updateScopes();
 
 private:
     QList<Scope*> m_scopes;
+    Scope *m_scopesOverview;
     bool m_loaded;
     QTimer timer;
 };
 
=== added file 'tests/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2014-07-29 11:27:22 +0000
@@ -0,0 +1,280 @@
+/*
+ * 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/>.
+ */
+
+#include "fake_scopesoverview.h"
+
+#include "fake_scopes.h"
+
+#include <paths.h>
+
+ScopesOverview::ScopesOverview(Scopes* parent)
+ : Scope("scopesOverview", "Scopes Overview", false, parent)
+{
+    delete m_categories; // delete the usual categories, we're not going to use it
+    m_scopesOverviewCategories = new ScopesOverviewCategories(parent, this);
+    m_searchCategories = new ScopesOverviewSearchCategories(parent, this);
+    m_categories = m_scopesOverviewCategories;
+}
+
+void ScopesOverview::setSearchQuery(const QString& search_query)
+{
+    Scope::setSearchQuery(search_query);
+
+    auto origCategories = m_categories;
+    if (search_query.isEmpty()) m_categories = m_scopesOverviewCategories;
+    else m_categories = m_searchCategories;
+
+    if (m_categories != origCategories)
+        Q_EMIT categoriesChanged();
+}
+
+Q_INVOKABLE void ScopesOverview::activate(QVariant const& result)
+{
+    Scopes *scopes = dynamic_cast<Scopes*>(parent());
+    m_openScope = scopes->getScopeFromAll(result.toString());
+    Q_EMIT openScope(m_openScope);
+}
+
+ScopesOverviewCategories::ScopesOverviewCategories(Scopes *scopes, QObject* parent)
+    : unity::shell::scopes::CategoriesInterface(parent)
+    , m_scopes(scopes)
+{
+}
+
+int ScopesOverviewCategories::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 2;
+}
+
+void ScopesOverviewCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
+{
+    qFatal("Using un-implemented ScopesOverviewCategories::addSpecialCategory");
+}
+
+bool ScopesOverviewCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
+{
+    qFatal("Using un-implemented ScopesOverviewCategories::overrideCategoryJson");
+}
+
+QVariant
+ScopesOverviewCategories::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    const QString categoryId = index.row() == 0 ? "favorites" : "all";
+
+    unity::shell::scopes::ResultsModelInterface *resultsModel = m_resultsModels[index.row()];
+    if (!resultsModel) {
+        QObject *that = const_cast<ScopesOverviewCategories*>(this);
+        resultsModel = new ScopesOverviewResultsModel(m_scopes->scopes(index.row() == 0), categoryId, that);
+        m_resultsModels[index.row()] = resultsModel;
+    }
+    switch (role) {
+        case RoleCategoryId:
+            return categoryId;
+        case RoleName:
+            return index.row() == 0 ? "Favorites" : "All";
+        case RoleIcon:
+            return QVariant();
+        case RoleRawRendererTemplate:
+            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
+            return QVariant();
+        case RoleRenderer:
+        {
+            QVariantMap map;
+            map["category-layout"] = "grid";
+            map["card-size"] = "small";
+            map["overlay"] = true;
+            return map;
+        }
+        case RoleComponents:
+        {
+            QVariantMap map, artMap;
+            artMap["aspect-ratio"] = "0.5";
+            artMap["field"] = "art";
+            map["art"] = artMap;
+            map["title"] = "HOLA";
+            return map;
+        }
+        case RoleResults:
+            return QVariant::fromValue(resultsModel);
+        case RoleCount:
+            return resultsModel->rowCount();
+        case RoleHeaderLink:
+            return QString();
+        default:
+            qFatal("Using un-implemented Categories role");
+            return QVariant();
+    }
+}
+
+
+
+ScopesOverviewSearchCategories::ScopesOverviewSearchCategories(Scopes *scopes, QObject* parent)
+    : unity::shell::scopes::CategoriesInterface(parent)
+    , m_scopes(scopes)
+{
+}
+
+int ScopesOverviewSearchCategories::rowCount(const QModelIndex& /*parent*/) const
+{
+    return 2;
+}
+
+void ScopesOverviewSearchCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
+{
+    qFatal("Using un-implemented ScopesOverviewSearchCategories::addSpecialCategory");
+}
+
+bool ScopesOverviewSearchCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
+{
+    qFatal("Using un-implemented ScopesOverviewSearchCategories::overrideCategoryJson");
+}
+
+QVariant
+ScopesOverviewSearchCategories::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    const QString categoryId = index.row() == 0 ? "searchA" : "searchB";
+
+    unity::shell::scopes::ResultsModelInterface *resultsModel = m_resultsModels[index.row()];
+    if (!resultsModel) {
+        QObject *that = const_cast<ScopesOverviewSearchCategories*>(this);
+        QList<unity::shell::scopes::ScopeInterface *> scopes;
+        if (index.row() == 0) {
+            scopes << m_scopes->getScopeFromAll("clickscope") << nullptr << m_scopes->getScopeFromAll("MockScope2");
+        } else {
+            scopes << nullptr << m_scopes->getScopeFromAll("MockScope7") << nullptr << m_scopes->getScopeFromAll("MockScope1");
+        }
+        resultsModel = new ScopesOverviewResultsModel(scopes, categoryId, that);
+        m_resultsModels[index.row()] = resultsModel;
+    }
+    switch (role) {
+        case RoleCategoryId:
+            return categoryId;
+        case RoleName:
+            return index.row() == 0 ? "SearchA" : "SearchB";
+        case RoleIcon:
+            return QVariant();
+        case RoleRawRendererTemplate:
+            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
+            return QVariant();
+        case RoleRenderer:
+        {
+            QVariantMap map;
+            map["category-layout"] = "grid";
+            map["card-size"] = "small";
+            map["overlay"] = true;
+            return map;
+        }
+        case RoleComponents:
+        {
+            QVariantMap map, artMap;
+            artMap["aspect-ratio"] = "1";
+            artMap["field"] = "art";
+            map["art"] = artMap;
+            map["title"] = "HOLA";
+            return map;
+        }
+        case RoleResults:
+            return QVariant::fromValue(resultsModel);
+        case RoleCount:
+            return resultsModel->rowCount();
+        case RoleHeaderLink:
+            return QString();
+        default:
+            qFatal("Using un-implemented Categories role");
+            return QVariant();
+    }
+}
+
+
+ScopesOverviewResultsModel::ScopesOverviewResultsModel(const QList<unity::shell::scopes::ScopeInterface *> &scopes, const QString &categoryId, QObject* parent)
+    : unity::shell::scopes::ResultsModelInterface(parent)
+    , m_scopes(scopes)
+    , m_categoryId(categoryId)
+{
+}
+
+QString ScopesOverviewResultsModel::categoryId() const
+{
+    return m_categoryId;
+}
+
+void ScopesOverviewResultsModel::setCategoryId(QString const& /*id*/)
+{
+    qFatal("Calling un-implemented ScopesOverviewResultsModel::setCategoryId");
+}
+
+int ScopesOverviewResultsModel::scopeIndex(QString const& id) const
+{
+    const int scopeCount = count();
+    for (int i = 0; i < scopeCount; ++i) {
+        if (m_scopes[i]->id() == id)
+            return i;
+    }
+    return -1;
+}
+
+QHash<int, QByteArray> ScopesOverviewResultsModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = unity::shell::scopes::ResultsModelInterface::roleNames();
+    roles[RoleBackground + 1] = "scopeId";
+    return roles;
+}
+
+int ScopesOverviewResultsModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+
+    return m_scopes.count();
+}
+
+int ScopesOverviewResultsModel::count() const
+{
+    return rowCount();
+}
+
+QVariant
+ScopesOverviewResultsModel::data(const QModelIndex& index, int role) const
+{
+    unity::shell::scopes::ScopeInterface *scope = m_scopes[index.row()];
+    switch (role) {
+        case RoleUri:
+        case RoleCategoryId:
+        case RoleDndUri:
+            return QString();
+        case RoleResult:
+            return scope ? scope->id() : QString("Result.%1.%2").arg(categoryId()).arg(index.row());
+        case RoleTitle:
+            return scope ? scope->name() : QString("Title.%1.%2").arg(categoryId()).arg(index.row());
+        case RoleArt:
+            return qmlDirectory() + "graphics/applicationIcons/dash.png";
+        case RoleMascot:
+        case RoleEmblem:
+        case RoleSummary:
+        case RoleBackground + 1: // scopeId
+            return scope ? scope->id() : nullptr;
+            break;
+        default:
+            return QVariant();
+    }
+}
 
=== added file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2014-07-29 11:27:22 +0000
@@ -0,0 +1,104 @@
+/*
+ * 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/>.
+ */
+
+#ifndef FAKE_SCOPESOVERVIEW_H
+#define FAKE_SCOPESOVERVIEW_H
+
+#include "fake_scope.h"
+#include <unity/shell/scopes/ResultsModelInterface.h>
+
+class Scopes;
+
+class ScopesOverview : public Scope
+{
+    Q_OBJECT
+
+public:
+    ScopesOverview(Scopes* parent = 0);
+
+    void setSearchQuery(const QString& search_query) override;
+    Q_INVOKABLE void activate(QVariant const& result) override;
+
+private:
+    unity::shell::scopes::CategoriesInterface *m_scopesOverviewCategories;
+    unity::shell::scopes::CategoriesInterface *m_searchCategories;
+};
+
+class ScopesOverviewCategories : public unity::shell::scopes::CategoriesInterface
+{
+    Q_OBJECT
+
+public:
+    ScopesOverviewCategories(Scopes *scopes, QObject* parent = 0);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
+    Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
+
+private:
+    mutable QHash<int, unity::shell::scopes::ResultsModelInterface*> m_resultsModels;
+
+    Scopes *m_scopes;
+};
+
+class ScopesOverviewSearchCategories : public unity::shell::scopes::CategoriesInterface
+{
+    Q_OBJECT
+
+public:
+    ScopesOverviewSearchCategories(Scopes *scopes, QObject* parent = 0);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
+    Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
+
+private:
+    mutable QHash<int, unity::shell::scopes::ResultsModelInterface*> m_resultsModels;
+
+    Scopes *m_scopes;
+};
+
+class ScopesOverviewResultsModel : public unity::shell::scopes::ResultsModelInterface
+{
+    Q_OBJECT
+
+public:
+    explicit ScopesOverviewResultsModel(const QList<unity::shell::scopes::ScopeInterface *> &scopes, const QString &categoryId, QObject* parent = 0);
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+    /* getters */
+    QString categoryId() const override;
+    int count() const override;
+
+    /* setters */
+    void setCategoryId(QString const& id) override;
+
+    /* Special API */
+    Q_INVOKABLE int scopeIndex(QString const& id) const;
+    QHash<int, QByteArray> roleNames() const override;
+
+private:
+    QList<unity::shell::scopes::ScopeInterface *> m_scopes;
+    QString m_categoryId;
+};
+
+#endif // FAKE_SCOPESOVERVIEW_H
 
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-07-08 12:37:34 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-07-29 11:27:22 +0000
@@ -109,6 +109,7 @@
                     anchors { left: parent.left; 
                             leftMargin: units.gu(1); 
                             right: parent.right; 
+                            rightMargin: units.gu(1);
                             top: overlayLoader.top; 
                             topMargin: units.gu(1);
 }
 
=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
--- tests/qmltests/Components/tst_PageHeader.qml	2014-07-08 08:30:46 +0000
+++ tests/qmltests/Components/tst_PageHeader.qml	2014-07-29 11:27:22 +0000
@@ -36,6 +36,16 @@
 
         function init() {
             searchEnabled = true;
+
+            // Reset to initial state
+            pageHeader.searchQuery = "";
+            pageHeader.closePopup();
+            pageHeader.searchHistory.clear();
+
+            // Check initial state
+            var headerContainer = findChild(pageHeader, "headerContainer");
+            tryCompareFunction(function() { return headerContainer.popover === null; }, true);
+            compare(pageHeader.searchHistory.count, 0);
         }
 
         function test_search_disabled() {
@@ -80,9 +90,6 @@
         }
 
         function test_history() {
-            pageHeader.searchHistory.clear()
-            compare(pageHeader.searchHistory.count, 0)
-
             pageHeader.triggerSearch()
             typeString("humppa1")
             pageHeader.resetSearch()
@@ -166,16 +173,26 @@
             tryCompareFunction(function() { return headerContainer.popover !== null; }, true);
 
             tryCompare(headerContainer.popover, "visible", true);
+
+            var searchTextField = findChild(pageHeader, "searchTextField");
+            compare(searchTextField.focus, true);
+
+            var recentSearches = findChild(headerContainer.popover, "recentSearches");
+            mouseClick(recentSearches.itemAt(0), 0, 0);
+
+            compare(pageHeader.searchQuery, "Search2");
+            tryCompareFunction(function() { return headerContainer.popover === null; }, true);
+            compare(searchTextField.focus, false);
         }
 
-        function test_tap_outside_closes_popup_data() {
+        function test_popup_closing_data() {
             return [
                         { tag: "with search text", searchText: "foobar", hideSearch: false },
                         { tag: "without search text", searchText: "", hideSearch: true }
                     ];
         }
 
-        function test_tap_outside_closes_popup(data) {
+        function test_popup_closing(data) {
             searchEnabled = true;
             pageHeader.searchHistory.clear();
 
@@ -191,13 +208,26 @@
 
             pageHeader.searchQuery = data.searchText;
 
-            mouseClick(root, root.width / 2, root.height - 1);
+            if (data.searchText == "") {
+                // When the text is empty the user can also close the
+                // popup by clicking outside the header instead of by starting a search
+                mouseClick(root, root.width / 2, root.height - 1);
+            }
 
             tryCompare(headerContainer, "showSearch", !data.hideSearch);
             tryCompareFunction(function() { return headerContainer.popover === null; }, true);
 
             pageHeader.resetSearch();
         }
+
+        function test_search_change_shows_search() {
+            var headerContainer = findChild(pageHeader, "headerContainer");
+            compare(headerContainer.showSearch, false);
+            compare(searchQuery, "");
+
+            searchQuery = "H";
+            compare(headerContainer.showSearch, true);
+        }
     }
 
     Column {
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-07-11 11:45:45 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-07-29 11:27:22 +0000
@@ -20,8 +20,6 @@
 import Ubuntu.Components 0.1
 import Unity.Test 0.1 as UT
 
-// TODO We don't have any tests for the overlay scope functionality.
-
 Item {
     id: shell
     width: units.gu(40)
@@ -86,10 +84,220 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(scopes, "loaded", true);
-            tryCompare(dashContentList, "count", 4);
+            tryCompare(dashContentList, "count", 6);
 
             verify(dashContentList != undefined);
             tryCompare(dashContentList, "currentIndex", data.visualIndex);
         }
+
+        function test_dash_overview_show_select_same_favorite() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(0).item);
+
+            // Click in first item
+            mouseClick(scopesOverviewFavoritesRepeater.itemAt(0).item, 0, 0);
+
+            // Make sure animation went back
+            tryCompare(overviewController, "progress", 0);
+            compare(dashContentList.currentIndex, 0);
+        }
+
+        function test_dash_overview_show_select_different_favorite() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(1).item);
+
+            // Click in first item
+            mouseClick(scopesOverviewFavoritesRepeater.itemAt(1).item, 0, 0);
+
+            // Make sure animation went back
+            tryCompare(overviewController, "progress", 0);
+            compare(dashContentList.currentIndex, 1);
+        }
+
+        function test_dash_overview_all_temp_scope_done_from_all() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 0);
+
+            // Make sure stuff is loaded
+            var scopesOverviewFavoritesRepeater = findChild(dash, "scopesOverviewFavoritesRepeater");
+            tryCompare(scopesOverviewFavoritesRepeater, "count", 6);
+            tryCompareFunction(function() { return scopesOverviewFavoritesRepeater.itemAt(0).item != null; }, true);
+            waitForRendering(scopesOverviewFavoritesRepeater.itemAt(1).item);
+
+            // Click on the all tab
+            var scopesOverviewAllTabButton = findChild(dash, "scopesOverviewAllTabButton");
+            mouseClick(scopesOverviewAllTabButton, 0, 0);
+
+            // Wait for all tab to be enabled (animation finish)
+            var scopesOverviewAllView = findChild(dash, "scopesOverviewRepeaterChild1");
+            tryCompare(scopesOverviewAllView, "enabled", true);
+
+            // Click on a temp scope
+            var tempScopeCard = findChild(scopesOverviewAllView, "delegate1");
+            mouseClick(tempScopeCard, 0, 0);
+
+            // Check the bottom edge (overview) is disabled from temp scope
+            var overviewDragHandle = findChild(dash, "overviewDragHandle");
+            compare(overviewDragHandle.enabled, false);
+
+            // Check temp scope is there
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", true);
+
+            // Go back
+            var scopesOverviewTempScopeItemHeader = findChild(scopesOverviewTempScopeItem, "scopePageHeader");
+            var backButton = findChild(findChild(scopesOverviewTempScopeItemHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Check temp scope is gone
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope == null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", false);
+
+            // Press on done
+            var scopesOverviewDoneButton = findChild(scopesOverview, "scopesOverviewDoneButton");
+            mouseClick(scopesOverviewDoneButton, 0, 0);
+
+            // Check the dash overview is gone
+            tryCompare(overviewController, "progress", 0);
+
+            // Original list is still on 0
+            compare(dashContentList.currentIndex, 0);
+        }
+
+        function test_temp_scope_dash_overview_all_search_temp_scope_favorite_from_all() {
+            // Wait for stuff to be loaded
+            tryCompare(scopes, "loaded", true);
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 6);
+            var mockScope1Loader = findChild(dash, "MockScope1 loader");
+            tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
+
+            // Swipe right to Apps scope
+            touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));
+            tryCompare(dashContentList, "contentX", dashContentList.width);
+            tryCompare(dashContentList, "currentIndex", 1);
+
+            // Click on card that opens temp scope
+            var dashCategory2 = findChild(dashContentList.currentItem, "dashCategory2");
+            var card2 = findChild(dashCategory2, "delegate2");
+            waitForRendering(card2);
+            mouseClick(card2, card2.width / 2, card2.height / 2);
+
+            // Wait for temp scope to be there
+            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
+            tryCompare(dashTempScopeItem, "x", 0);
+
+            // Show the overview
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
+            var overviewController = findInvisibleChild(dash, "overviewController");
+            tryCompare(overviewController, "progress", 1);
+
+            // Make sure tab is where it should
+            var scopesOverview = findChild(dash, "scopesOverview");
+            compare(scopesOverview.currentTab, 1);
+
+            // Do a search
+            var scopesOverviewPageHeader = findChild(scopesOverview, "scopesOverviewPageHeader");
+            var searchButton = findChild(scopesOverviewPageHeader, "search_header_button");
+            mouseClick(searchButton, 0, 0);
+
+            // Type something
+            keyClick(Qt.Key_H);
+
+            // Check results grid is there and the other lists are not
+            var searchResultsViewer = findChild(scopesOverview, "searchResultsViewer");
+            var scopesOverviewRepeater = findChild(dash, "scopesOverviewRepeater");
+            tryCompare(searchResultsViewer, "opacity", 1);
+            tryCompare(scopesOverviewRepeater, "count", 0);
+
+            // Click on a temp scope in the search
+            var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
+            var cardTempScope = findChild(dashCategorysearchA, "delegate2");
+            waitForRendering(cardTempScope);
+            mouseClick(cardTempScope, cardTempScope.width / 2, cardTempScope.height / 2);
+
+            // Check the bottom edge (overview) is disabled from temp scope
+            var overviewDragHandle = findChild(dash, "overviewDragHandle");
+            compare(overviewDragHandle.enabled, false);
+
+            // Check temp scope is there
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope != null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", true);
+
+            // Go back
+            var scopesOverviewTempScopeItemHeader = findChild(scopesOverviewTempScopeItem, "scopePageHeader");
+            var backButton = findChild(findChild(scopesOverviewTempScopeItemHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+
+            // Check temp scope is gone
+            var scopesOverviewTempScopeItem = findChild(dash, "scopesOverviewTempScopeItem");
+            tryCompareFunction( function() { return scopesOverviewTempScopeItem.scope == null; }, true);
+            tryCompare(scopesOverviewTempScopeItem, "enabled", false);
+
+            // Press on a favorite
+            var dashCategorysearchB = findChild(searchResultsViewer, "dashCategorysearchB");
+            var cardFavSearch = findChild(dashCategorysearchB, "delegate3");
+            mouseClick(cardFavSearch, 0, 0);
+
+            // Check the dash overview is gone
+            tryCompare(overviewController, "progress", 0);
+
+            // Original list went to the favorite
+            compare(dashContentList.currentIndex, 0);
+        }
     }
 }
 
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-07-21 13:28:35 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2014-07-29 11:27:22 +0000
@@ -73,7 +73,7 @@
         function loadScopes() {
             scopeLoadedSpy.clear();
             scopesModel.load();
-            tryCompare(scopeLoadedSpy, "count", 4);
+            tryCompare(scopeLoadedSpy, "count", 10);
         }
 
         function init() {
@@ -117,7 +117,8 @@
 
             loadScopes();
 
-            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);
+            compare(dashContentList.count, 10);
+            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
         }
 
         function test_show_header_on_list_movement() {
@@ -173,7 +174,7 @@
 
             // test greater than scope count.
             var currentScopeIndex = dashContent.currentIndex;
-            dashContent.setCurrentScopeAtIndex(8, true, false);
+            dashContent.setCurrentScopeAtIndex(18, true, false);
             compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
         }
 
@@ -380,5 +381,17 @@
             mouseClick(allButton, 0, 0);
             tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
         }
+
+        function test_searchHint() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            verify(dashContentList !== null);
+            var scope = findChild(dashContent, "MockScope1 loader");
+            waitForRendering(scope);
+
+            var categoryListView = findChild(scope, "categoryListView");
+            waitForRendering(categoryListView);
+
+            compare(categoryListView.pageHeader.searchHint, "Search People");
+        }
     }
 }