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

[Albert Astals Cid]

Don't show the manage dash pull up arrow on temp 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5083/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/248
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/681
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16867

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

would it be possible to add a test for this? like from a temp scope test, add a check for the opacity.
otherwise, seems to work fine

[Albert Astals Cid (aacid)]

There's a problem with adding a test, between clicking the temporary scope and the scope being shown, there's some cycles in between spent in the scope backend in scope.activate so i can not add a compare() call just after the click because it will fail.

I can add a tryCompare call but then it would still pass without the patch because it did eventually go back to 0 opacity.

So i did not find a sane way to test this patch actually does something :/

[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.

no. unrelated AP failure

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/unity8-ci/5120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/734
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16937

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/bottomEdgeArrow1401869]

1525. By Albert Astals Cid on 2015-01-12

Merge lp:unity8

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-01-09 10:39:55 +0000
+++ qml/Dash/Dash.qml	2015-01-12 08:31:44 +0000
@@ -304,8 +304,8 @@
     Image {
         source: "graphics/overview_hint.png"
         anchors.horizontalCenter: parent.horizontalCenter
-        opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
-                 (overviewDragHandle.enabled || bottomEdgeController.progress != 0) ? 1 : 0
+        opacity: !scopeItem.scope && (scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
+                 (overviewDragHandle.enabled || overviewDragHandle.status.progress != 0) ? 1 : 0
         Behavior on opacity {
             enabled: bottomEdgeController.progress == 0
             UbuntuNumberAnimation {}