@@ -268,19 +268,6 @@ Item {
268268 property list<Notification> nlist: [
269269 Notification {
270270 nid: 1
271− type: Notification.SnapDecision
272− hints: {"x-canonical-private-affirmative-tint": "true"}
273− summary: "Theatre at Ferria Stadium"
274− body: "at Ferria Stadium in Bilbao, Spain\n07578545317"
275− icon: ""
276− secondaryIcon: ""
277− value: 0
278− rawActions: ["ok_id", "Ok",
279− "snooze_id", "Snooze",
280− "view_id", "View"]
281− },
282− Notification {
283− nid: 2
284271 type: Notification.Ephemeral
285272 summary: "Photo upload completed"
286273 body: ""
@@ -290,7 +277,7 @@ Item {
290277 rawActions: []
291278 },
292279 Notification {
293− nid: 3
280+ nid: 2
294281 type: Notification.Ephemeral
295282 hints: {"x-canonical-private-affirmative-tint": "false",
296283 "sound-file": "dummy.ogg",
@@ -303,7 +290,7 @@ Item {
303290 rawActions: []
304291 },
305292 Notification {
306− nid: 4
293+ nid: 3
307294 type: Notification.Interactive
308295 hints: {"x-canonical-private-affirmative-tint": "false",
309296 "sound-file": "dummy.ogg"}
@@ -315,7 +302,7 @@ Item {
315302 rawActions: ["reply_id", "Dummy"]
316303 },
317304 Notification {
318− nid: 5
305+ nid: 4
319306 type: Notification.SnapDecision
320307 hints: {"x-canonical-private-affirmative-tint": "false",
321308 "sound-file": "dummy.ogg"}
@@ -328,7 +315,7 @@ Item {
328315 "reject_id", "Reject"]
329316 },
330317 Notification {
331− nid: 6
318+ nid: 5
332319 type: Notification.Ephemeral
333320 hints: {"x-canonical-private-affirmative-tint": "false",
334321 "sound-file": "dummy.ogg"}
@@ -340,7 +327,7 @@ Item {
340327 rawActions: []
341328 },
342329 Notification {
343− nid: 7
330+ nid: 6
344331 type: Notification.Ephemeral
345332 hints: {"x-canonical-private-affirmative-tint": "false",
346333 "x-canonical-non-shaped-icon": "true"}
@@ -352,7 +339,7 @@ Item {
352339 rawActions: []
353340 },
354341 Notification {
355− nid: 8
342+ nid: 7
356343 type: Notification.Confirmation
357344 hints: {"x-canonical-non-shaped-icon": "true"}
358345 summary: ""
@@ -363,7 +350,7 @@ Item {
363350 rawActions: []
364351 },
365352 Notification {
366− nid: 9
353+ nid: 8
367354 type: Notification.Confirmation
368355 hints: {"x-canonical-non-shaped-icon": "true",
369356 "x-canonical-value-bar-tint" : "true"}
@@ -373,30 +360,27 @@ Item {
373360 secondaryIcon: ""
374361 value: 85
375362 rawActions: []
363+ },
364+ Notification {
365+ nid: 9
366+ type: Notification.SnapDecision
367+ hints: {"x-canonical-private-affirmative-tint": "true"}
368+ summary: "Theatre at Ferria Stadium"
369+ body: "at Ferria Stadium in Bilbao, Spain\n07578545317"
370+ icon: ""
371+ secondaryIcon: ""
372+ value: 0
373+ rawActions: ["ok_id", "Ok",
374+ "snooze_id", "Snooze",
375+ "view_id", "View"]
376376 }
377377 ]
378378
379379 function test_NotificationRenderer_data() {
380380 return [
381− {
382− tag: "2-over-1 Snap Decision with button-tint",
383− n: nlist[0],
384− summaryVisible: true,
385− bodyVisible: true,
386− iconVisible: false,
387− centeredIconVisible: false,
388− shaped: false,
389− secondaryIconVisible: false,
390− buttonRowVisible: false,
391− buttonTinted: true,
392− hasSound: false,
393− valueVisible: false,
394− valueLabelVisible: false,
395− valueTinted: false
396− },
397381 {
398382 tag: "Ephemeral notification - icon-summary layout",
399− n: nlist[1],
383+ n: nlist[0],
400384 summaryVisible: true,
401385 bodyVisible: false,
402386 iconVisible: true,
@@ -412,7 +396,7 @@ Item {
412396 },
413397 {
414398 tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
415− n: nlist[2],
399+ n: nlist[1],
416400 summaryVisible: true,
417401 bodyVisible: false,
418402 interactiveAreaEnabled: false,
@@ -429,7 +413,7 @@ Item {
429413 },
430414 {
431415 tag: "Interactive notification",
432− n: nlist[3],
416+ n: nlist[2],
433417 summaryVisible: true,
434418 bodyVisible: true,
435419 iconVisible: true,
@@ -445,7 +429,7 @@ Item {
445429 },
446430 {
447431 tag: "Snap Decision without secondary icon and no button-tint",
448− n: nlist[4],
432+ n: nlist[3],
449433 summaryVisible: true,
450434 bodyVisible: true,
451435 iconVisible: true,
@@ -461,7 +445,7 @@ Item {
461445 },
462446 {
463447 tag: "Ephemeral notification",
464− n: nlist[5],
448+ n: nlist[4],
465449 summaryVisible: true,
466450 bodyVisible: true,
467451 iconVisible: true,
@@ -477,7 +461,7 @@ Item {
477461 },
478462 {
479463 tag: "Ephemeral notification with non-shaped icon",
480− n: nlist[6],
464+ n: nlist[5],
481465 summaryVisible: true,
482466 bodyVisible: true,
483467 iconVisible: true,
@@ -493,7 +477,7 @@ Item {
493477 },
494478 {
495479 tag: "Confirmation notification with value",
496− n: nlist[7],
480+ n: nlist[6],
497481 summaryVisible: false,
498482 bodyVisible: false,
499483 iconVisible: false,
@@ -509,7 +493,7 @@ Item {
509493 },
510494 {
511495 tag: "Confirmation notification with value, label and tint",
512− n: nlist[8],
496+ n: nlist[7],
513497 summaryVisible: false,
514498 bodyVisible: false,
515499 iconVisible: false,
@@ -522,6 +506,22 @@ Item {
522506 valueVisible: true,
523507 valueLabelVisible: true,
524508 valueTinted: true
509+ },
510+ {
511+ tag: "2-over-1 Snap Decision with button-tint",
512+ n: nlist[8],
513+ summaryVisible: true,
514+ bodyVisible: true,
515+ iconVisible: false,
516+ centeredIconVisible: false,
517+ shaped: false,
518+ secondaryIconVisible: false,
519+ buttonRowVisible: false,
520+ buttonTinted: true,
521+ hasSound: false,
522+ valueVisible: false,
523+ valueLabelVisible: false,
524+ valueTinted: false
525525 }
526526 ]
527527 }