Merge lp:~michael-sheldon/gallery-app/hide-toolbar-share-picker into lp:gallery-app

[Michael Sheldon]

Hide the media viewer toolbar when displaying the share picker.

Hide the media viewer toolbar when displaying the share picker.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1011
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/888/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/218
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1515/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/888/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/gallery-app) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[Arthur Mello (artmello)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/gallery-app) on device or emulator?
YES

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

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
YES

[Arthur Mello (artmello)]

looks good

review: Approve

[lp:~michael-sheldon/gallery-app/hide-toolbar-share-picker]

1012. By Michael Sheldon on 2014-07-21

Merge from trunk

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2014-06-20 15:25:14 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2014-07-21 13:07:37 +0000
@@ -64,7 +64,7 @@
                            (galleryPhotoViewer.currentItem ? galleryPhotoViewer.currentItem.isLoaded : false)
 
     // tooolbar actions for the full view
-    property Item tools: media ? (media.type === MediaSource.Photo ?
+    property Item tools: (media && !sharePicker.visible) ? (media.type === MediaSource.Photo ?
                                       d.photoToolbar : d.videoToolbar)
                                : null