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
48
        metadata: "subscope:applications.scope/applications-non-click.scope"
48
        metadata: "subscope:applications.scope/applications-non-click.scope"
6
49
    }
49
    }
7
50
    ListElement {
50
    ListElement {
9
51
        uri: "application://camera-app.desktop"
51
        uri: "appid://com.ubuntu.camera/camera/current-user-version"
10
52
        icon: "../../graphics/applicationIcons/camera.png"
52
        icon: "../../graphics/applicationIcons/camera.png"
11
53
        category: 0
53
        category: 0
12
54
        mimetype: "application/x-desktop"
54
        mimetype: "application/x-desktop"
13
55
        title: "Camera"
55
        title: "Camera"
14
56
        comment: ""
56
        comment: ""
17
57
        dndUri: "file:///usr/share/applications/camera-app.desktop"
57
        dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
18
58
        metadata: "subscope:applications.scope/applications-non-click.scope"
58
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
19
59
    }
59
    }
20
60
    ListElement {
60
    ListElement {
22
61
        uri: "application://gallery-app.desktop"
61
        uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
23
62
        icon: "../../graphics/applicationIcons/gallery.png"
62
        icon: "../../graphics/applicationIcons/gallery.png"
24
63
        category: 0
63
        category: 0
25
64
        mimetype: "application/x-desktop"
64
        mimetype: "application/x-desktop"
26
65
        title: "Gallery"
65
        title: "Gallery"
27
66
        comment: ""
66
        comment: ""
30
67
        dndUri: "file:///usr/share/applications/gallery.desktop"
67
        dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
31
68
        metadata: "subscope:applications.scope/applications-non-click.scope"
68
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
32
69
    }
69
    }
33
70
    ListElement {
70
    ListElement {
34
71
        uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
71
        uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
35
72
72
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
163
        self.assertThat(hud.shown, Eventually(Equals(False)))
163
        self.assertThat(hud.shown, Eventually(Equals(False)))
41
164
164
42
165
    def _launch_test_app_from_app_screen(self):
165
    def _launch_test_app_from_app_screen(self):
44
166
        """Launches the camera app using the Dash UI.
166
        """Launches the browser app using the Dash UI.
45
167
167
46
168
        Because when testing on the desktop running
168
        Because when testing on the desktop running
47
169
        self.launch_application() will launch the application on the desktop
169
        self.launch_application() will launch the application on the desktop
48
@@ -171,7 +171,7 @@
49
171
171
50
172
        """
172
        """
51
173
        dash = self.main_window.get_dash()
173
        dash = self.main_window.get_dash()
53
174
        icon = dash.get_application_icon('Camera')
174
        icon = dash.get_application_icon('Browser')
54
175
        self.touch.tap_object(icon)
175
        self.touch.tap_object(icon)
55
176
176
56
177
        # Ensure application is open
177
        # Ensure application is open
57
178
178
58
=== renamed file 'tests/mocks/data/applications/camera-app.desktop' => 'tests/mocks/data/applications/webbrowser-app.desktop'
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
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	48	metadata: "subscope:applications.scope/applications-non-click.scope"	48	metadata: "subscope:applications.scope/applications-non-click.scope"
6	49	}	49	}
7	50	ListElement {	50	ListElement {
9	51	uri: "application://camera-app.desktop"	51	uri: "appid://com.ubuntu.camera/camera/current-user-version"
10	52	icon: "../../graphics/applicationIcons/camera.png"	52	icon: "../../graphics/applicationIcons/camera.png"
11	53	category: 0	53	category: 0
12	54	mimetype: "application/x-desktop"	54	mimetype: "application/x-desktop"
13	55	title: "Camera"	55	title: "Camera"
14	56	comment: ""	56	comment: ""
17	57	dndUri: "file:///usr/share/applications/camera-app.desktop"	57	dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
18	58	metadata: "subscope:applications.scope/applications-non-click.scope"	58	metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
19	59	}	59	}
20	60	ListElement {	60	ListElement {
22	61	uri: "application://gallery-app.desktop"	61	uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
23	62	icon: "../../graphics/applicationIcons/gallery.png"	62	icon: "../../graphics/applicationIcons/gallery.png"
24	63	category: 0	63	category: 0
25	64	mimetype: "application/x-desktop"	64	mimetype: "application/x-desktop"
26	65	title: "Gallery"	65	title: "Gallery"
27	66	comment: ""	66	comment: ""
30	67	dndUri: "file:///usr/share/applications/gallery.desktop"	67	dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
31	68	metadata: "subscope:applications.scope/applications-non-click.scope"	68	metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
32	69	}	69	}
33	70	ListElement {	70	ListElement {
34	71	uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"	71	uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
35	72		72
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	163	self.assertThat(hud.shown, Eventually(Equals(False)))	163	self.assertThat(hud.shown, Eventually(Equals(False)))
41	164		164
42	165	def _launch_test_app_from_app_screen(self):	165	def _launch_test_app_from_app_screen(self):
44	166	"""Launches the camera app using the Dash UI.	166	"""Launches the browser app using the Dash UI.
45	167		167
46	168	Because when testing on the desktop running	168	Because when testing on the desktop running
47	169	self.launch_application() will launch the application on the desktop	169	self.launch_application() will launch the application on the desktop
48	@@ -171,7 +171,7 @@
49	171		171
50	172	"""	172	"""
51	173	dash = self.main_window.get_dash()	173	dash = self.main_window.get_dash()
53	174	icon = dash.get_application_icon('Camera')	174	icon = dash.get_application_icon('Browser')
54	175	self.touch.tap_object(icon)	175	self.touch.tap_object(icon)
55	176		176
56	177	# Ensure application is open	177	# Ensure application is open
57	178		178
58	=== renamed file 'tests/mocks/data/applications/camera-app.desktop' => 'tests/mocks/data/applications/webbrowser-app.desktop'