Merge lp:~josharenson/unity8/close-extra-panel-when-selected into lp:unity8

[Josh Arenson]

Close the PageHeaderExtraPanel when a filter option is selected

 * Are there any related MPs required for this MP to build/function as expected? Please list.
Yes, ~josharenson/unity8/fix-primary-filter-scrolling which has already been merged into this branch.

 * 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, clean

 * 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?
Not sure if Albert already got approval for this or not...

[Albert Astals Cid (aacid)]

Please use a different name + comment instead of " signal filterOptionSelected()" in the future we may use it for other "single selection" filters like a radio button,

Also a test would be nice.

review: Needs Fixing

[Josh Arenson (josharenson)]

Updated signal name and added a test

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2340
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1089/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/640
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/640
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/640/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1463
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1429
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1429
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1429/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1429/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1429/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1429/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1429/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1429
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1429/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1089/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2342
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1093/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/647
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/647
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/647
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1470
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1436
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1436
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1436/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1436
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1436/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1093/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2343
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1095/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/649
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/649
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/649/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1472
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1438
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1438
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1438/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1438
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1438/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1095/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I don't think that "expandingItem.expanded = false" there is a good idea, for example, multi selector options or option selector filters that are in the filter "popup" should not behave like that.

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2344
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1104/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/657
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/657
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/657/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1482
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1447
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1447
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1447/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1447/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1447/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1447/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1447/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1447
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1447/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1104/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2345
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1118/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/674
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/674
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/674/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1502
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1466
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1466
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1466/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1466
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1466/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1118/rebuild

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2348. By Josh Arenson on 2016-05-03

merge trunk

[Albert Astals Cid (aacid)]

Instead of

dashContent.currentScope.setHasNavigation(false)

in the test can you do

switch_to_scope_that_has_no_navigation

?

This way when/if it fails it'll be easier to reproduce "manually" with make tryDashContent

review: Needs Information

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2346
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1126/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1512/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1126/rebuild

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2349. By Josh Arenson on 2016-05-04

merge prereq

[Josh Arenson (josharenson)]

Moved test, fixed conflicts, stripped tags

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2347
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1128/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1514
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1477
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1477
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1477/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1477/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1477/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1477/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1477/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1477/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1128/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2347
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1129/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1515
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1478
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1478
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1478/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1478/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1129/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Something went wrong with the merging?

Now it doesn't even compile :S

review: Needs Information

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2348
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1133/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1519
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1482
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1482
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1482/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1482/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1133/rebuild

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2350. By Josh Arenson on 2016-05-05

Merge trunk

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2349
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1136/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1524/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1136/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2350
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1137/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1525/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1137/rebuild

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2351. By Josh Arenson on 2016-05-05

Rebase

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2351
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1138/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1526/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1138/rebuild

review: Needs Fixing (continuous-integration)

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2352. By Josh Arenson on 2016-05-05

merge prereq

[Josh Arenson (josharenson)]

Untangled the disastrous merge situation. For real.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2352
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1139/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1527
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1487
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1487
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1487/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1487/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1487/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1487/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1487/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1487/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1139/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
+ function test_navigationFilterPopupClosesWhenOptionSelected() {
"""

Did you use tab chars here?

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2353. By Josh Arenson on 2016-05-06

Fix tab

[Josh Arenson (josharenson)]

> """
> + function test_navigationFilterPopupClosesWhenOptionSelected()
> {
> """
>
> Did you use tab chars here?

Thats what I get for copy pasting with gedit :-p. Fixing now.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2353
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1145/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/699
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/699
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/699/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1537
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1497
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1497
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1497/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1497/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1497/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1497/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1497/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1497
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1497/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1145/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good now.

But to make it behave more like the real world we should have

http://paste.ubuntu.com/16316839/

on the mock plugin, so that actually when selecting a option the "navitgation block" shows up.

Can you add that to this MR? Or you prefer we do it in a separate one?

review: Needs Information

[Josh Arenson (josharenson)]

> Looks good now.
>
> But to make it behave more like the real world we should have
>
> http://paste.ubuntu.com/16316839/
>
> on the mock plugin, so that actually when selecting a option the "navitgation
> block" shows up.
>
> Can you add that to this MR? Or you prefer we do it in a separate one?

I'll add it. It isn't necessary for this branch, but it is a small change and its more correct.

[lp:~josharenson/unity8/close-extra-panel-when-selected]

2354. By Josh Arenson on 2016-05-09

Set the filterTag in the search box when one is selected

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2354
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1162/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/712
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/712
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/712/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1555
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1515
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1515
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1515
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1515/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1162/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* 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.
Yes, except broken autopilot

review: Approve

=== modified file 'qml/Dash/Filters/FilterOptionSelector.qml'
--- qml/Dash/Filters/FilterOptionSelector.qml	2016-01-27 10:39:24 +0000
+++ qml/Dash/Filters/FilterOptionSelector.qml	2016-05-09 20:25:44 +0000
@@ -25,6 +25,8 @@
 
     implicitHeight: expandingItem.height
 
+    signal filterSelected()
+
     ListItems.Expandable {
         id: expandingItem
         objectName: "expandingItem"
@@ -67,6 +69,7 @@
             width: parent.width
             Repeater {
                 model: widgetData.options
+                objectName: "optionsRepeater"
 
                 ListItems.Standard {
                     text: label
@@ -83,6 +86,7 @@
 
                     onClicked: {
                         widgetData.options.setChecked(index, !checked);
+                        root.filterSelected()
                     }
                 }
             }

=== modified file 'qml/Dash/Filters/FilterWidgetFactory.qml'
--- qml/Dash/Filters/FilterWidgetFactory.qml	2016-04-19 13:02:11 +0000
+++ qml/Dash/Filters/FilterWidgetFactory.qml	2016-05-09 20:25:44 +0000
@@ -31,6 +31,9 @@
     //! Widget data, forwarded to the widget as is.
     property var widgetData: null
 
+    // Emitted iff filter type is FilterOptionSelector
+    signal singleSelectionFilterSelected()
+
     implicitHeight: title.height + title.anchors.topMargin + loader.height
 
     Label {
@@ -77,5 +80,10 @@
             item.widgetId = Qt.binding(function() { return root.widgetId } )
             item.widgetData = Qt.binding(function() { return root.widgetData } )
         }
+
+        Connections {
+            target: widgetType == Filters.OptionSelectorFilter ? loader.item : null
+            onFilterSelected: root.singleSelectionFilterSelected()
+        }
     }
 }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-05-04 18:08:35 +0000
+++ qml/Dash/GenericScopeView.qml	2016-05-09 20:25:44 +0000
@@ -689,6 +689,11 @@
                 categoryView.pageHeader.closePopup();
                 categoryView.pageHeader.unfocus();
             }
+
+            onExtraPanelOptionSelected: {
+                categoryView.pageHeader.closePopup();
+                categoryView.pageHeader.unfocus();
+            }
         }
     }
 

=== modified file 'qml/Dash/PageHeaderExtraPanel.qml'
--- qml/Dash/PageHeaderExtraPanel.qml	2016-05-09 20:25:43 +0000
+++ qml/Dash/PageHeaderExtraPanel.qml	2016-05-09 20:25:44 +0000
@@ -36,6 +36,7 @@
 
     signal historyItemClicked(string text)
     signal dashNavigationLeafClicked()
+    signal extraPanelOptionSelected()
 
     function resetNavigation() {
         dashNavigation.resetNavigation();
@@ -181,6 +182,8 @@
             widgetId: filter ? filter.filterId : ""
             widgetType: filter ? filter.filterType : -1
             widgetData: filter
+
+            onSingleSelectionFilterSelected: extraPanelOptionSelected()
         }
     }
 

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2016-05-09 20:25:43 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2016-05-09 20:25:44 +0000
@@ -52,6 +52,8 @@
     m_primaryNavigationFilter = new FakeOptionSelectorFilter("OSF3", "PFTag", "Which food you like More", false, primaryNavigationFilterOptionLabels, this);
     m_filters->addFakeFilters();
     connect(m_filters, &Filters::activeFiltersCountChanged, this, &Scope::activeFiltersCountChanged);
+    connect(m_primaryNavigationFilter, &FakeOptionSelectorFilter::isActiveChanged,
+            this, &unity::shell::scopes::ScopeInterface::primaryNavigationTagChanged);
 }
 
 QString Scope::id() const
@@ -325,6 +327,8 @@
 
 QString Scope::primaryNavigationTag() const
 {
+    if (m_hasPrimaryFilter && m_primaryNavigationFilter->isActive())
+        return m_primaryNavigationFilter->filterTag();
     if (m_currentNavigationId == "root")
         return QString();
     else

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-05-09 20:25:43 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2016-05-09 20:25:44 +0000
@@ -146,6 +146,33 @@
             tryCompare(categoryListView, "atYBeginning", true)
         }
 
+        function test_navigationFilterPopupClosesWhenOptionSelected() {
+            dash.setCurrentScope("LongPrimaryNavigation")
+
+            var dashContentList = findChild(dashContent, "dashContentList")
+            var searchButton = findChild(dashContentList.currentItem, "search_button")
+            verify(searchButton)
+            var extraPanel = findChild(dashContentList.currentItem, "peExtraPanel")
+            verify(extraPanel)
+
+            var primaryFilter = findChild(extraPanel, "primaryFilter")
+            var expandingItem = findChild(primaryFilter, "expandingItem")
+            verify(expandingItem)
+            tryCompare(expandingItem, "expanded", false)
+
+            mouseClick(searchButton)
+            expandingItem.expanded = true
+            tryCompare(expandingItem, "expanded", true)
+            tryCompareFunction(function() { return expandingItem.height == expandingItem.expandedHeight; }, true);
+
+            var optionsRepeater = findChild(expandingItem, "optionsRepeater")
+            verify(optionsRepeater)
+            verify(optionsRepeater.itemAt(0))
+            tryCompare(optionsRepeater.itemAt(0), "visible", true)
+            mouseClick(optionsRepeater.itemAt(0))
+            tryCompare(expandingItem, "visible", false)
+        }
+
         function test_manage_dash_clickscope_unfavoritable() {
             // Show the manage dash
             touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));