1
=== modified file 'debian/control'
2
--- debian/control	2014-04-29 15:08:05 +0000
3
+++ debian/control	2014-04-30 08:42:30 +0000
4
@@ -102,7 +102,7 @@
5
102
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
102
         qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
6
103
         ubuntu-thumbnailer-impl-0,
103
         ubuntu-thumbnailer-impl-0,
7
104
         unity-application-impl-2,
104
         unity-application-impl-2,
9
105
         unity-notifications-impl-2,
105
         unity-notifications-impl-3,
10
106
         unity-plugin-scopes | unity-scopes-impl,
106
         unity-plugin-scopes | unity-scopes-impl,
11
107
         unity-scopes-impl-0,
107
         unity-scopes-impl-0,
12
108
         unity8-fake-env | unity-application-impl,
108
         unity8-fake-env | unity-application-impl,
13
109
109
14
=== modified file 'qml/Notifications/Notifications.qml'
15
--- qml/Notifications/Notifications.qml	2014-03-17 15:31:06 +0000
16
+++ qml/Notifications/Notifications.qml	2014-04-30 08:42:30 +0000
17
@@ -16,6 +16,8 @@
18
16
16
19
17
import QtQuick 2.0
17
import QtQuick 2.0
20
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
21
19
import Unity.Notifications 1.0 as UnityNotifications
22
20
import Utils 0.1
23
19
import "../Components"
21
import "../Components"
24
20
22
25
21
ListView {
23
ListView {
26
@@ -25,6 +27,15 @@
27
25
    interactive: false
27
    interactive: false
28
26
28
29
27
    property real margin
29
    property real margin
30
30
    property bool useModal: snapDecisionProxyModel.count > 0
31
31
32
32
    SortFilterProxyModel {
33
33
        id: snapDecisionProxyModel
34
34
35
35
        model: notificationList.model
36
36
        filterRole: UnityNotifications.ModelInterface.RoleType
37
37
        filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)
38
38
    }
39
28
    spacing: delegate.fullscreen ? 0 : units.gu(.5)
39
    spacing: delegate.fullscreen ? 0 : units.gu(.5)
40
29
40
41
30
    currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
41
    currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
42
31
42
43
=== modified file 'qml/Shell.qml'
44
--- qml/Shell.qml	2014-04-17 15:43:16 +0000
45
+++ qml/Shell.qml	2014-04-30 08:42:30 +0000
46
@@ -582,6 +582,24 @@
47
582
            }
582
            }
48
583
        }
583
        }
49
584
584
50
585
        Rectangle {
51
586
            id: modalNotificationBackground
52
587
53
588
            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
54
589
            color: "#000000"
55
590
            anchors.fill: parent
56
591
            opacity: 0.5
57
592
58
593
            MouseArea {
59
594
                anchors.fill: parent
60
595
            }
61
596
62
597
            InputFilterArea {
63
598
                anchors.fill: parent
64
599
                blockInput: modalNotificationBackground.visible
65
600
            }
66
601
        }
67
602
68
585
        Notifications {
603
        Notifications {
69
586
            id: notifications
604
            id: notifications
70
587
605
71
588
606
72
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
73
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-04-29 15:21:20 +0000
74
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-04-30 08:42:30 +0000
75
@@ -211,6 +211,89 @@
76
211
        self.touch.tap_object(notification.select_single(objectName="button4"))
211
        self.touch.tap_object(notification.select_single(objectName="button4"))
77
212
        self.assert_notification_action_id_was_called("action_decline_4")
212
        self.assert_notification_action_id_was_called("action_decline_4")
78
213
213
79
214
    def test_modal_sd_without_greeter (self):
80
215
        """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""
81
216
        unity_proxy = self.launch_unity()
82
217
        unlock_unity(unity_proxy)
83
218
84
219
        summary = "Incoming file"
85
220
        body = "Frank would like to send you the file: essay.pdf"
86
221
        icon_path = "sync-idle"
87
222
        hints = [
88
223
            ("x-canonical-snap-decisions", "true"),
89
224
            ("x-canonical-non-shaped-icon", "true"),
90
225
        ]
91
226
92
227
        actions = [
93
228
            ('action_accept', 'Accept'),
94
229
            ('action_decline_1', 'Decline'),
95
230
        ]
96
231
97
232
        self._create_interactive_notification(
98
233
            summary,
99
234
            body,
100
235
            icon_path,
101
236
            "NORMAL",
102
237
            actions,
103
238
            hints
104
239
        )
105
240
106
241
        # verify that we cannot reveal the launcher (no longer interact with the shell)
107
242
        time.sleep(1)
108
243
        self.main_window.show_dash_swiping()
109
244
        launcher = self.main_window.get_launcher()
110
245
        self.assertThat(launcher.shown, Eventually(Equals(False)))
111
246
112
247
        # verify and interact with the triggered snap-decision notification
113
248
        notify_list = self._get_notifications_list()
114
249
        get_notification = lambda: notify_list.wait_select_single(
115
250
            'Notification', objectName='notification1')
116
251
        notification = get_notification()
117
252
        self._assert_notification(notification, summary, body, True, False, 1.0)
118
253
        self.touch.tap_object(notification.select_single(objectName="button0"))
119
254
        self.assert_notification_action_id_was_called("action_accept")
120
255
121
256
    def test_modal_sd_with_greeter (self):
122
257
        """A snap-decision on a phone should not block input to the greeter beneath it."""
123
258
        unity_proxy = self.launch_unity()
124
259
125
260
        summary = "Incoming file"
126
261
        body = "Frank would like to send you the file: essay.pdf"
127
262
        icon_path = "sync-idle"
128
263
        hints = [
129
264
            ("x-canonical-snap-decisions", "true"),
130
265
            ("x-canonical-non-shaped-icon", "true"),
131
266
        ]
132
267
133
268
        actions = [
134
269
            ('action_accept', 'Accept'),
135
270
            ('action_decline_1', 'Decline'),
136
271
        ]
137
272
138
273
        self._create_interactive_notification(
139
274
            summary,
140
275
            body,
141
276
            icon_path,
142
277
            "NORMAL",
143
278
            actions,
144
279
            hints
145
280
        )
146
281
147
282
        # verify that we can swipe away the greeter (interact with the "shell")
148
283
        time.sleep(1)
149
284
        self.main_window.show_dash_swiping()
150
285
        greeter = self.main_window.get_greeter()
151
286
        self.assertThat(greeter.shown, Eventually(Equals(False)))
152
287
153
288
        # verify and interact with the triggered snap-decision notification
154
289
        notify_list = self._get_notifications_list()
155
290
        get_notification = lambda: notify_list.wait_select_single(
156
291
            'Notification', objectName='notification1')
157
292
        notification = get_notification()
158
293
        self._assert_notification(notification, summary, body, True, False, 1.0)
159
294
        self.touch.tap_object(notification.select_single(objectName="button0"))
160
295
        self.assert_notification_action_id_was_called("action_accept")
161
296
162
214
    def _create_interactive_notification(
297
    def _create_interactive_notification(
163
215
        self,
298
        self,
164
216
        summary="",
299
        summary="",
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Approve on 2014-05-05
Michał Sawicz		2014-03-14	Approve on 2014-05-05
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-04-30
Jouni Helminen (community)		2014-04-03	Approve on 2014-04-03
Review via email: mp+210988@code.launchpad.net