Unity 8

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

gallery-and-camera-to-click
Merge into trunk

Proposed by Sergio Schvezov on 2014-02-20

Status:	Superseded
Proposed branch:	lp:~sergiusens/unity8/gallery-and-camera-to-click
Merge into:	lp:unity8
Diff against target:	58 lines (+8/-8) 2 files modified qml/Dash/Apps/FrequentlyUsedAppsModel.qml (+6/-6) tests/autopilot/unity8/shell/tests/test_hud.py (+2/-2)
To merge this branch:	bzr merge lp:~sergiusens/unity8/gallery-and-camera-to-click
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-02-20	Needs Fixing on 2014-02-24
Sergio Schvezov			Pending
Review via email: mp+207501@code.launchpad.net

This proposal supersedes a proposal from 2014-02-14.

Commit message

Convert gallery and camera to click

Description of the change

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

Revision history for this message

Bill Filler (bfiller) wrote on 2014-02-14: Posted in a previous version of this proposal

* 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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-17: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2014-02-18: Posted in a previous version of this proposal

I approve

review: Approve

Revision history for this message

Sergio Schvezov (sergiusens) on 2014-02-20: Posted in a previous version of this proposal

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-24:

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

review: Needs Fixing (continuous-integration)

lp:~sergiusens/unity8/gallery-and-camera-to-click updated on 2014-02-24

716. By Sergio Schvezov on 2014-02-24: Fixing appid for camera and gallery
717. By Sergio Schvezov on 2014-02-24: changing test app to webbrowser

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Sergio Schvezov

Unity Team

1	=== modified file 'qml/Dash/Apps/FrequentlyUsedAppsModel.qml'
2	--- qml/Dash/Apps/FrequentlyUsedAppsModel.qml 2013-10-14 15:19:35 +0000
3	+++ qml/Dash/Apps/FrequentlyUsedAppsModel.qml 2014-02-24 20:57:21 +0000
4	@@ -48,24 +48,24 @@
5	metadata: "subscope:applications.scope/applications-non-click.scope"
6	}
7	ListElement {
8	- uri: "application://camera-app.desktop"
9	+ uri: "appid://com.ubuntu.camera/camera/current-user-version"
10	icon: "../../graphics/applicationIcons/camera.png"
11	category: 0
12	mimetype: "application/x-desktop"
13	title: "Camera"
14	comment: ""
15	- dndUri: "file:///usr/share/applications/camera-app.desktop"
16	- metadata: "subscope:applications.scope/applications-non-click.scope"
17	+ dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
18	+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
19	}
20	ListElement {
21	- uri: "application://gallery-app.desktop"
22	+ uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
23	icon: "../../graphics/applicationIcons/gallery.png"
24	category: 0
25	mimetype: "application/x-desktop"
26	title: "Gallery"
27	comment: ""
28	- dndUri: "file:///usr/share/applications/gallery.desktop"
29	- metadata: "subscope:applications.scope/applications-non-click.scope"
30	+ dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
31	+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
32	}
33	ListElement {
34	uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
35
36	=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
37	--- tests/autopilot/unity8/shell/tests/test_hud.py 2014-02-13 04:13:36 +0000
38	+++ tests/autopilot/unity8/shell/tests/test_hud.py 2014-02-24 20:57:21 +0000
39	@@ -163,7 +163,7 @@
40	self.assertThat(hud.shown, Eventually(Equals(False)))
41
42	def _launch_test_app_from_app_screen(self):
43	- """Launches the camera app using the Dash UI.
44	+ """Launches the browser app using the Dash UI.
45
46	Because when testing on the desktop running
47	self.launch_application() will launch the application on the desktop
48	@@ -171,7 +171,7 @@
49
50	"""
51	dash = self.main_window.get_dash()
52	- icon = dash.get_application_icon('Camera')
53	+ icon = dash.get_application_icon('Browser')
54	self.touch.tap_object(icon)
55
56	# Ensure application is open
57
58	=== renamed file 'tests/mocks/data/applications/camera-app.desktop' => 'tests/mocks/data/applications/webbrowser-app.desktop'