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

[Albert Astals Cid]

Dash manage hint should not be visible in previews+test

 * 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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1615
http://jenkins.qa.ubuntu.com/job/unity8-ci/5322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18079

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/noManageDashHintPreview]

1616. By Albert Astals Cid on 2015-02-16

line--

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, that added test fails without the changes in Dash.qml
 * Did CI run pass? If not, please explain why.
y
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

[lp:~aacid/unity8/noManageDashHintPreview]

1617. By Albert Astals Cid on 2015-02-17

Merge

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-02-12 12:20:49 +0000
+++ qml/Dash/Dash.qml	2015-02-17 08:28:17 +0000
@@ -300,10 +300,11 @@
     }
 
     Image {
+        objectName: "overviewHint"
         source: "graphics/overview_hint.png"
         anchors.horizontalCenter: parent.horizontalCenter
         opacity: !scopeItem.scope && (scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
-                 (overviewDragHandle.enabled || overviewDragHandle.status.progress != 0) ? 1 : 0
+                 (overviewDragHandle.enabled || bottomEdgeController.progress != 0) ? 1 : 0
         Behavior on opacity {
             enabled: bottomEdgeController.progress == 0
             UbuntuNumberAnimation {}
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2015-02-12 14:03:22 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2015-02-17 08:28:17 +0000
@@ -429,6 +429,28 @@
             tryCompare(dashContentList, "currentIndex", 1)
         }
 
+        function test_preview_no_show_manage_dash_hint() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            tryCompareFunction(function() {
+                var cardGrid = findChild(dashContentList, "dashCategory0");
+                if (cardGrid != null) {
+                    var tile = findChild(cardGrid, "delegate0");
+                    return tile != null;
+                }
+                return false;
+            },
+            true);
+            var tile = findChild(findChild(dashContentList, "dashCategory0"), "delegate0");
+            waitForRendering(tile);
+            mouseClick(tile);
+
+            var overviewHint = findChild(dash, "overviewHint");
+            tryCompare(overviewHint, "opacity", 0);
+        }
+
         function test_close_temp_scope_preview_opening_scope() {
             // Show the manage dash
             touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));