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

[Albert Astals Cid]

Allow pulling manage dash if there's no favorite scopes

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

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

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

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

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

[Michael Zanetti (mzanetti)]

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

yes

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

n/a

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

yes

review: Approve

[Michał Sawicz (saviq)]

Can we have a test for this?

review: Needs Information

[Albert Astals Cid (aacid)]

Added

[lp:~aacid/unity8/bottom_list_no_favorites]

1484. By Albert Astals Cid on 2014-12-10

Add test

1485. By Albert Astals Cid on 2014-12-10

remove wrong comment

1486. By Albert Astals Cid on 2014-12-10

Fix comment

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-12-03 07:44:46 +0000
+++ qml/Dash/Dash.qml	2014-12-10 08:49:06 +0000
@@ -304,7 +304,7 @@
     Image {
         source: "graphics/overview_hint.png"
         anchors.horizontalCenter: parent.horizontalCenter
-        opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : dashContent.pageHeaderTotallyVisible) &&
+        opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
                  (overviewDragHandle.enabled || bottomEdgeController.progress != 0) ? 1 : 0
         Behavior on opacity {
             enabled: bottomEdgeController.progress == 0
@@ -324,8 +324,7 @@
         z: 1
         direction: Direction.Upwards
         enabled: !dashContent.subPageShown &&
-                  dashContent.currentScope &&
-                  dashContent.currentScope.searchQuery == "" &&
+                  (scopes.count == 0 || (dashContent.currentScope && dashContent.currentScope.searchQuery == "")) &&
                   !scopeItem.scope &&
                   (bottomEdgeController.progress == 0 || dragging)
 

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-03 07:44:46 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-10 08:49:06 +0000
@@ -211,6 +211,25 @@
             compare(dashContentList.currentIndex, 0);
         }
 
+        function test_manage_dash_open_no_favorites() {
+            // Make it so there are no scopes
+            scopes.clear();
+            var dashContentList = findChild(dash, "dashContentList");
+            tryCompare(dashContentList, "count", 0);
+
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            // Go back
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "pageHeader");
+            var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "backButton");
+            mouseClick(backButton, 0, 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+        }
+
         function test_setCurrentScope() {
             var dashContentList = findChild(dash, "dashContentList");
             var startX = dash.width - units.gu(1);