Merge lp:~unity-team/unity8/no-search-on-preview into lp:unity8

[Michał Sawicz]

Only allow searching when preview isn't open.

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
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:754
http://jenkins.qa.ubuntu.com/job/unity8-ci/2440/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3707
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3298/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/965
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/965/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3300
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3300/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5670/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4521

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/no-search-on-preview]

755. By Michał Sawicz on 2014-03-06

Fix cleanup().

[Michael Zanetti (mzanetti)]

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

Yes, works fine.

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

no. "NoSuchProcess: no process found" seems to be caused by a known crash with Qt 5.0 and should go away when we move to 5.2

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:755
http://jenkins.qa.ubuntu.com/job/unity8-ci/2443/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3714
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3305/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/968
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3719
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3307
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3307/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5676/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4528

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-02-18 11:54:25 +0000
+++ qml/Dash/Dash.qml	2014-03-06 12:04:17 +0000
@@ -27,6 +27,7 @@
     visible: shown
 
     property ListModel searchHistory: SearchHistoryModel {}
+    property bool searchable: !dashContent.previewOpen
 
     property string showScopeOnLoaded: "home.scope"
     property real contentScale: 1.0

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-02-18 11:54:25 +0000
+++ qml/Dash/DashContent.qml	2014-03-06 12:04:17 +0000
@@ -25,6 +25,7 @@
     property var model: null
     property var scopes: null
     property alias currentIndex: dashContentList.currentIndex
+    property alias previewOpen: previewListView.open
 
     property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
     property ListModel searchHistory

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-03-04 11:42:38 +0000
+++ qml/Shell.qml	2014-03-06 12:04:17 +0000
@@ -594,7 +594,7 @@
                 contentEnabled: edgeDemo.panelContentEnabled
             }
             fullscreenMode: shell.fullscreenMode
-            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
+            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
 
             InputFilterArea {
                 anchors {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-01-16 12:37:57 +0000
+++ tests/qmltests/tst_Shell.qml	2014-03-06 12:04:17 +0000
@@ -110,6 +110,9 @@
             swipeUntilScopeViewIsReached(dashHome);
 
             hideIndicators();
+
+            var dashContent = findChild(shell, "dashContent");
+            dashContent.previewOpen = false;
         }
 
         function killApps(apps) {
@@ -549,5 +552,18 @@
             tryCompare(greeter, "shown", true)
             tryCompare(searchIndicator, "opacity", 0)
         }
+
+        function test_searchIndicatorHideOnPreviewShown() {
+            var searchIndicator = findChild(shell, "container");
+            var dashContent = findChild(shell, "dashContent");
+
+            verify(dashContent != null);
+
+            tryCompare(searchIndicator, "opacity", 1);
+
+            dashContent.previewOpen = true;
+
+            tryCompare(searchIndicator, "opacity", 0);
+        }
     }
 }