Merge lp:~bfiller/unity8/gallery-and-camera-to-click into lp:unity8

[Bill Filler]

convert gallery and camera to click

Convert gallery and camera to click. Requires other MR's to land together with this (as reflected in CI Train):
- https://code.launchpad.net/~bfiller/ubuntu/trusty/ubuntu-settings/touch-settings-click/+merge/206530
- https://code.launchpad.net/~bfiller/gallery-app/click-support/+merge/201238
- https://code.launchpad.net/~bfiller/camera-app/click-support/+merge/200889
- https://code.launchpad.net/~ken-vandine/content-hub/defaults_triplet/+merge/203841

[Bill Filler (bfiller)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.
YES
https://code.launchpad.net/~bfiller/unity8/gallery-and-camera-to-click/+merge/206534 https://code.launchpad.net/~bfiller/ubuntu/trusty/ubuntu-settings/touch-settings-click/+merge/206530 https://code.launchpad.net/~ken-vandine/content-hub/defaults_triplet/+merge/203841 https://code.launchpad.net/~bfiller/gallery-app/click-support/+merge/201238
https://code.launchpad.net/~bfiller/camera-app/click-support/+merge/200889
https://code.launchpad.net/~bfiller/ubuntu-seeds/ubuntu-touch.trusty-remove-gallery-camera/+merge/206537

* 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:715
http://jenkins.qa.ubuntu.com/job/unity8-ci/2330/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3253
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2923/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/851
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/855
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/855/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/851
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3255
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2925
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2925/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5329/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3977

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:715
http://jenkins.qa.ubuntu.com/job/unity8-ci/2335/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3275
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2943/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/860
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/856
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2883
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3277
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2945
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2945/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5349/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4018

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

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

I approve

review: Approve

[Sergio Schvezov (sergiusens)]

review: Needs Fixing

Unmerged revisions

=== modified file 'qml/Dash/Apps/FrequentlyUsedAppsModel.qml'
--- qml/Dash/Apps/FrequentlyUsedAppsModel.qml	2013-10-14 15:19:35 +0000
+++ qml/Dash/Apps/FrequentlyUsedAppsModel.qml	2014-02-14 17:24:44 +0000
@@ -48,24 +48,24 @@
         metadata: "subscope:applications.scope/applications-non-click.scope"
     }
     ListElement {
-        uri: "application://camera-app.desktop"
+        uri: "appid://com.ubuntu.camera/camera/current-user-version"
         icon: "../../graphics/applicationIcons/camera.png"
         category: 0
         mimetype: "application/x-desktop"
         title: "Camera"
         comment: ""
-        dndUri: "file:///usr/share/applications/camera-app.desktop"
-        metadata: "subscope:applications.scope/applications-non-click.scope"
+        dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
+        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera/camera/current-user-version"
     }
     ListElement {
-        uri: "application://gallery-app.desktop"
+        uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
         icon: "../../graphics/applicationIcons/gallery.png"
         category: 0
         mimetype: "application/x-desktop"
         title: "Gallery"
         comment: ""
-        dndUri: "file:///usr/share/applications/gallery.desktop"
-        metadata: "subscope:applications.scope/applications-non-click.scope"
+        dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
+        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery/gallery/current-user-version"
     }
     ListElement {
         uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"