Merge lp:~macslow/unity8/qmltest-tweak-for-1354406-workaround into lp:unity8

[Mirco Müller]

Made notification qml-test pass again by using Component.onCompleted instead of onOpacityChanged for the time being.

Made notification qml-test pass again by using Component.onCompleted instead of onOpacityChanged for the time being. Added FIXME-remarks regarding currently used workaround for LP: #1354406. Avoid some QWARNs.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No.

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* Did you make sure that your branch does not contain spurious tags?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1185
http://jenkins.qa.ubuntu.com/job/unity8-ci/4047/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5138
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11883

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

review: Approve

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-08-20 16:14:40 +0000
+++ qml/Notifications/Notification.qml	2014-08-21 08:08:54 +0000
@@ -52,7 +52,7 @@
     implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
 
     color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
-    opacity: 1
+    opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
 
     state: {
         var result = "";
@@ -82,7 +82,8 @@
         source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
     }
 
-    onOpacityChanged: {
+    // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
+    Component.onCompleted: {
         if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source) {
             sound.play();
         }
@@ -380,7 +381,7 @@
                             id: comboRepeater
 
                             onVisibleChanged: {
-                                comboButton.text = comboRepeater.itemAt(2).actionLabel
+                                comboButton.text = comboRepeater.count >= 3 ? comboRepeater.itemAt(2).actionLabel : ""
                             }
 
                             model: notification.actions

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2014-08-20 16:14:40 +0000
+++ qml/Notifications/Notifications.qml	2014-08-21 08:08:54 +0000
@@ -63,7 +63,8 @@
 
         // make sure there's no opacity-difference between the several
         // elements in a notification
-        layer.enabled: add.running || remove.running || populate.running
+        // FIXME: disabled all transitions because of LP: #1354406 workaround
+        //layer.enabled: add.running || remove.running || populate.running
 
         Component.onCompleted: {
             if (index == 1) {
@@ -79,6 +80,7 @@
         }
     }
 
+    // FIXME: disabled all transitions because of LP: #1354406 workaround
     /*populate: Transition {
         UbuntuNumberAnimation {
             property: "opacity"