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

[Albert Astals Cid]

Disable dash overview if in temp scope preview

 * 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:1205
http://jenkins.qa.ubuntu.com/job/unity8-ci/4130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4107/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1224
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5359/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Please rebase on scope setting

review: Needs Fixing

[Albert Astals Cid (aacid)]

> Please rebase on scope setting

Why?

[Andrea Cimitan (cimi)]

> > Please rebase on scope setting
>
> Why?
previewShown is gone

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1205
http://jenkins.qa.ubuntu.com/job/unity8-ci/4138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4123
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5375
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12214

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/dashOverviewFromTempScopePreview]

1206. By Albert Astals Cid on 2014-08-28

Merge

[Albert Astals Cid (aacid)]

> Please rebase on scope setting

Merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
http://jenkins.qa.ubuntu.com/job/unity8-ci/4154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4169
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5421
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5421/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12267

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * 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.
One failure fixed elsewhere.

review: Approve

[Andrea Cimitan (cimi)]

Fine now

review: Approve

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-08-25 16:07:45 +0000
+++ qml/Dash/Dash.qml	2014-08-28 07:58:59 +0000
@@ -344,6 +344,7 @@
         enabled: !dashContent.subPageShown &&
                   dashContent.currentScope &&
                   dashContent.currentScope.searchQuery == "" &&
+                  !scopeItem.subPageShown &&
                   (overviewController.progress == 0 || dragging)
 
         readonly property real fullMovement: units.gu(20)