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

[Albert Astals Cid]

Show search field if the search query changes

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

 * 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?
It has been requested by design

[Michael Zanetti (mzanetti)]

It adds a tiny oddity:
* Go to clickscope
* start a search
* click on App store

=> now, on clicking the back button it first hides the search, and only a second click goes back to the clickscope.

Approving nevertheless as this is really minor and the gain of this merge is much bigger. In case we fix/workaround this oddity I'm fine with that being a separate fix at a later point.

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

Not yet, but signs are good :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1090
http://jenkins.qa.ubuntu.com/job/unity8-ci/3637/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/731
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3808
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10513

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

review: Approve (continuous-integration)

[lp:~aacid/unity8/showSearchOnSearchQueryChange]

1091. By Albert Astals Cid on 2014-07-30

Merge

=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-07-30 07:49:12 +0000
+++ qml/Components/PageHeader.qml	2014-07-30 07:49:12 +0000
@@ -44,6 +44,12 @@
     signal backClicked()
 
     onScopeStyleChanged: refreshLogo()
+    onSearchQueryChanged: {
+        // Make sure we are at the search page if the search query changes behind our feet
+        if (searchQuery) {
+            headerContainer.showSearch = true;
+        }
+    }
 
     function triggerSearch() {
         if (searchEntryEnabled) {
 
=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
--- tests/qmltests/Components/tst_PageHeader.qml	2014-07-30 07:49:12 +0000
+++ tests/qmltests/Components/tst_PageHeader.qml	2014-07-30 07:49:12 +0000
@@ -219,6 +219,15 @@
 
             pageHeader.resetSearch();
         }
+
+        function test_search_change_shows_search() {
+            var headerContainer = findChild(pageHeader, "headerContainer");
+            compare(headerContainer.showSearch, false);
+            compare(searchQuery, "");
+
+            searchQuery = "H";
+            compare(headerContainer.showSearch, true);
+        }
     }
 
     Column {