Merge lp:~unity-team/unity8/fix-1308011 into lp:unity8

[Michael Zanetti]

Fixes gap at top of sim-unlock/fullscreen notification (point 1.), fixes blocking overlay if underlying UnityMenuModel vanishes from DBus (point 2.). The third bullet-point of the bug-report, lockup of shell-UI, could not be reproduced.

Fixes gap at top of sim-unlock/fullscreen notification (point 1.), fixes blocking overlay if underlying UnityMenuModel vanishes from DBus (point 2.). The third bullet-point of the bug-report, lockup of shell-UI, could not be reproduced.

- Are there any related MPs required for this MP to build/function as expected?
Yes. lp:~larsu/qmenumodel/add-nameowner-property and lp:~macslow/unity-notifications/fix-1308011 need to land first before this can be merged to trunk.

- 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

[Mirco Müller (macslow)]

Since I also worked on this branch, I should not be a reviewer.

review: Abstain

[Michał Sawicz (saviq)]

See inline.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1002
http://jenkins.qa.ubuntu.com/job/unity8-ci/3429/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1950/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/433/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/523
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/523
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2199/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3063
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9799

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1002
http://jenkins.qa.ubuntu.com/job/unity8-ci/3435/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1977/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/529
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/529/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/529
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2216/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3092
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9820

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Replied to one inline comment

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1002
http://jenkins.qa.ubuntu.com/job/unity8-ci/3438/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2003/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/532
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/532/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/532
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2242/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3121
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9851

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/fix-1308011]

1003. By Mirco Müller on 2014-07-15

Reverted an accidental commit of a temporary experiment with the sound-hints.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1003
http://jenkins.qa.ubuntu.com/job/unity8-ci/3441/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2011/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/535
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/535
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2248/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9863

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Inline.

review: Needs Fixing

[lp:~unity-team/unity8/fix-1308011]

1004. By Mirco Müller on 2014-07-15

Avoid undefined-assignment warning for QUrl-based source.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1004
http://jenkins.qa.ubuntu.com/job/unity8-ci/3442/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2026/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/536
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/536/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/536
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2262/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3152
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9881

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/fix-1308011]

1005. By Mirco Müller on 2014-07-15

Updated debian/control to require newer version of qmenumodel.

[Michał Sawicz (saviq)]

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

 * Did CI run pass? If not, please explain why.
New required dependencies.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1005
http://jenkins.qa.ubuntu.com/job/unity8-ci/3444/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2039/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/445/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/538/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/538/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/538/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3167/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-11 08:47:58 +0000
+++ debian/control	2014-07-15 16:16:00 +0000
@@ -17,7 +17,7 @@
                libhud-client2-dev,
                libpay1-dev,
                libpulse-dev,
-               libqmenumodel-dev (>= 0.2.7),
+               libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
                libunity-api-dev (>= 7.85),
                libunity-mir-dev,
@@ -52,7 +52,7 @@
 
 Package: indicators-client
 Architecture: amd64 armhf i386
-Depends: qmenumodel-qml (>= 0.2.7),
+Depends: qmenumodel-qml (>= 0.2.8),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
          unity8 (= ${binary:Version}),
          ${misc:Depends},
@@ -77,7 +77,7 @@
          libcap2-bin,
          libglib2.0-bin,
          libunity-mir1 (>= 0.4),
-         qmenumodel-qml (>= 0.2.7),
+         qmenumodel-qml (>= 0.2.8),
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-ubuntu-settings-components (>= 0.3),

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-07-11 08:50:21 +0000
+++ qml/Notifications/Notification.qml	2014-07-15 16:16:00 +0000
@@ -36,7 +36,7 @@
     property var hints
     property var notification
     property color color
-    property bool fullscreen
+    property bool fullscreen: false
     property int maxHeight
     property int margins
     property Gradient greenGradient : Gradient {
@@ -48,7 +48,6 @@
         GradientStop { position: 1.0; color: "#4d4745" }
     }
 
-    fullscreen: false
     objectName: "background"
     implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
 
@@ -80,7 +79,7 @@
     Audio {
         id: sound
         objectName: "sound"
-        source: hints["suppress-sound"] != "" ? hints["sound-file"] : undefined
+        source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
     }
 
     onOpacityChanged: {
@@ -159,9 +158,17 @@
         UnityMenuModel {
             id: unityMenuModel
 
+            property string lastNameOwner: ""
+
             busName: paths.busName
             actions: paths.actions
             menuObjectPath: paths.menuObjectPath
+            onNameOwnerChanged: {
+                if (lastNameOwner != "" && nameOwner == "" && notification.notification != undefined) {
+                    notification.notification.close()
+                }
+                lastNameOwner = nameOwner
+            }
         }
 
         Behavior on implicitHeight {
@@ -272,14 +279,18 @@
             }
 
             Column {
+                id: dialogColumn
                 objectName: "dialogListView"
                 spacing: units.gu(2)
 
                 visible: count > 0
 
-                anchors.left: parent.left; anchors.right: parent.right
-                anchors.top: fullscreen ? parent.top : undefined
-                anchors.bottom: fullscreen ? parent.bottom : undefined
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    top: fullscreen ? parent.top : undefined
+                    bottom: fullscreen ? parent.bottom : undefined
+                }
 
                 Repeater {
                     model: unityMenuModel
@@ -287,7 +298,10 @@
                     NotificationMenuItemFactory {
                         id: menuItemFactory
 
-                        anchors.left: parent.left; anchors.right: parent.right
+                        anchors {
+                            left: dialogColumn.left
+                            right: dialogColumn.right
+                        }
 
                         menuModel: unityMenuModel
                         menuData: model

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-06-11 15:36:51 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-07-15 16:16:00 +0000
@@ -50,7 +50,10 @@
         Column {
             spacing: units.gu(2)
 
-            anchors.left: parent.left; anchors.right: parent.right
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
 
             Component.onCompleted: {
                 menuModel.loadExtendedAttributes(menuIndex, {"x-echo-mode-password": "bool"});
@@ -67,7 +70,10 @@
 
                 // TODO using Qt.ImhNoPredictiveText here until lp #1291575 is fixed for ubuntu-ui-toolkit
                 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                anchors.left: parent.left; anchors.right: parent.right
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
                 echoMode: checkBox.checked ? TextInput.Normal : TextInput.Password
                 height: units.gu(5)
                 onTextChanged: {
@@ -98,7 +104,10 @@
         id: pinLock
 
         Lockscreen {
-            anchors.left: parent.left; anchors.right: parent.right
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
             height: menuFactory.maxHeight
             placeholderText: i18n.tr("Please enter SIM PIN")
             background: shell.background

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2014-04-10 14:21:48 +0000
+++ qml/Notifications/Notifications.qml	2014-07-15 16:16:00 +0000
@@ -36,8 +36,11 @@
         filterRole: UnityNotifications.ModelInterface.RoleType
         filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)
     }
-    spacing: delegate.fullscreen ? 0 : units.gu(.5)
-
+
+    property bool topmostIsFullscreen: false
+    spacing: topmostIsFullscreen ? 0 : units.gu(.5)
+
+    // FIXME: This doesn't make any sense and results in a binding loop
     currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
 
     delegate: Notification {
@@ -61,6 +64,19 @@
         // make sure there's no opacity-difference between the several
         // elements in a notification
         layer.enabled: add.running || remove.running || populate.running
+
+        Component.onCompleted: {
+            if (index == 1) {
+                notificationList.topmostIsFullscreen = fullscreen
+            }
+        }
+
+        onFullscreenChanged: {
+            // index 1 because 0 is the PlaceHolder...
+            if (index == 1) {
+                notificationList.topmostIsFullscreen = fullscreen
+            }
+        }
     }
 
     populate: Transition {