Merge lp:~lukas-kde/unity8/notificationExpansionLogicFixes into lp:unity8

[Lukáš Tinkl]

First snap decision should always be expanded, unless user decides otherwise

Based on design input, tweak the snap decisions' expansion logic: unless expanded by user, always let the first snap decision be expanded.

Also, silence some runtime warnings, mainly by updating our obsolete QtMultimedia mock.

Fixes lp:1575045

* 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

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

N/A

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

Yes

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2377
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1111/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/664
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/664
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/664
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1489
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1454/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1454/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1454/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1454/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1454/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1454
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1454/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1111/rebuild

review: Approve (continuous-integration)

[lp:~lukas-kde/unity8/notificationExpansionLogicFixes]

2378. By Lukáš Tinkl on 2016-05-05

merge trunk

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2378
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1140/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/690
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/690
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/690/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1528
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1488
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1488/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1140/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Could probably use a test for this.

[lp:~lukas-kde/unity8/notificationExpansionLogicFixes]

2379. By Lukáš Tinkl on 2016-05-10

fix expansion state for password prompts

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2379
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1177/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/720
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/720
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1577
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1534/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1534/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1534/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1534/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1534/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1534
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1534/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1177/rebuild

review: Approve (continuous-integration)

[lp:~lukas-kde/unity8/notificationExpansionLogicFixes]

2380. By Lukáš Tinkl on 2016-05-11

add a test for expansion logic

[Lukáš Tinkl (lukas-kde)]

> Could probably use a test for this.

Yup, just added one

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2380
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1185/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/727
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/727
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1587
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1542
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1542
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1542/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1542/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1542/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1542/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1542/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1542
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1542/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1185/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/notificationExpansionLogicFixes]

2381. By Lukáš Tinkl on 2016-05-11

revert a noop check

[Michael Terry (mterry)]

LGTM

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2381
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1190/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/732
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/732
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1592
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1547
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1547
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1547/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1547/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1547/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1547/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1547/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1547
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1547/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1190/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2016-04-27 15:01:10 +0000
+++ qml/Notifications/Notification.qml	2016-05-11 14:55:36 +0000
@@ -99,6 +99,10 @@
     }
 
     function closeNotification() {
+        if (index === ListView.view.currentIndex) { // reset to get the 1st snap decision expanded
+            ListView.view.currentIndex = -1;
+        }
+
         if (notification.actions.count > 1) { // perform the "reject" action
             notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId));
         }
@@ -382,7 +386,7 @@
                 objectName: "dialogListView"
                 spacing: notification.margins
 
-                visible: count > 0
+                visible: count > 0 && notification.expanded
 
                 anchors {
                     left: parent.left

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2016-04-27 15:01:10 +0000
+++ qml/Notifications/Notifications.qml	2016-05-11 14:55:36 +0000
@@ -52,7 +52,7 @@
         type: model.type
         hints: model.hints
         iconSource: model.icon
-        secondaryIconSource: model.secondaryIcon
+        secondaryIconSource: model.secondaryIcon ? model.secondaryIcon : ""
         summary: model.summary
         body: model.body
         value: model.value ? model.value : -1

=== modified file 'tests/mocks/QtMultimedia/audio.cpp'
--- tests/mocks/QtMultimedia/audio.cpp	2016-04-18 09:53:45 +0000
+++ tests/mocks/QtMultimedia/audio.cpp	2016-05-11 14:55:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 Audio::Audio(QObject* parent):
     QObject(parent),
     m_playbackState(StoppedState),
-    m_playlist(0)
+    m_playlist(nullptr)
 {
     qsrand(time(nullptr));
     m_timer.setInterval(1000);
@@ -109,7 +109,7 @@
 
 Audio::AudioRole Audio::audioRole() const
 {
-    return Audio::multimedia;
+    return Audio::MusicRole;
 }
 
 void Audio::setAudioRole(Audio::AudioRole audioRole)

=== modified file 'tests/mocks/QtMultimedia/audio.h'
--- tests/mocks/QtMultimedia/audio.h	2016-04-18 09:53:45 +0000
+++ tests/mocks/QtMultimedia/audio.h	2016-05-11 14:55:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2015 Canonical, Ltd.
+ * Copyright (C) 2012-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,13 +44,19 @@
     };
 
     enum AudioRole {
-        alarm,
-        alert,
-        multimedia,
-        phone
+        UnknownRole,
+        MusicRole,
+        VideoRole,
+        VoiceCommunicationRole,
+        AlarmRole,
+        NotificationRole,
+        RingtoneRole,
+        AccessibilityRole,
+        SonificationRole,
+        GameRole
     };
 
-    explicit Audio(QObject *parent = 0);
+    explicit Audio(QObject *parent = nullptr);
 
     QUrl source() const;
     void setSource(const QUrl &source);

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2016-04-27 15:01:10 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2016-05-11 14:55:36 +0000
@@ -725,6 +725,95 @@
                 tryCompare(mockModel, "count", before - 1)
             }
 
+            function expansionLogic_data() {
+                return [{
+                            tag: "Snap Decision without secondary icon and no button-tint",
+                            n: nlist[3],
+                            summaryVisible: true,
+                            bodyVisible: true,
+                            iconVisible: true,
+                            centeredIconVisible: false,
+                            shaped: true,
+                            secondaryIconVisible: false,
+                            buttonRowVisible: true,
+                            buttonTinted: false,
+                            hasSound: true,
+                            valueVisible: false,
+                            valueLabelVisible: false,
+                            valueTinted: false
+                        },
+                        {
+                            tag: "2-over-1 Snap Decision with button-tint",
+                            n: nlist[8],
+                            summaryVisible: true,
+                            bodyVisible: true,
+                            iconVisible: false,
+                            centeredIconVisible: false,
+                            shaped: false,
+                            secondaryIconVisible: false,
+                            buttonRowVisible: false,
+                            buttonTinted: true,
+                            hasSound: false,
+                            valueVisible: false,
+                            valueLabelVisible: false,
+                            valueTinted: false
+                        },
+                        {
+                            tag: "Snap Decision without secondary icon and no button-tint",
+                            n: nlist[3],
+                            summaryVisible: true,
+                            bodyVisible: true,
+                            iconVisible: true,
+                            centeredIconVisible: false,
+                            shaped: true,
+                            secondaryIconVisible: false,
+                            buttonRowVisible: true,
+                            buttonTinted: false,
+                            hasSound: true,
+                            valueVisible: false,
+                            valueLabelVisible: false,
+                            valueTinted: false
+                        }
+                        ]
+            }
+
+            function test_expansionLogic() {
+                var data = expansionLogic_data();
+
+                // fill the model
+                data.forEach(function(notification) {
+                    mockModel.append(notification.n);
+                    notification.n.completed.connect(mockModel.onCompleted)
+                })
+
+                // make sure the view is properly updated before going on
+                notifications.forceLayout();
+                waitForRendering(notifications);
+
+                // first one should be expanded by default
+                var notification1 = findChild(notifications, "notification1") // 0 is placeholder...
+                verify(!!notification1, "notification wasn't found");
+                waitForRendering(notification1);
+                verify(notification1.expanded);
+
+                // click the 2nd one, verify it's now expanded
+                var notification2 = findChild(notifications, "notification2") // 0 is placeholder...
+                verify(!!notification2, "notification wasn't found");
+                waitForRendering(notification2);
+                mouseClick(notification2);
+                verify(notification2.expanded);
+                verify(!notification1.expanded);
+
+                // now close the 2nd one, verify 1st is again expanded, 2nd is gone
+                var dragStart = notification2.width * 0.25;
+                var dragEnd = notification2.width;
+                var dragY = notification2.height / 2;
+                touchFlick(notification2, dragStart, dragY, dragEnd, dragY);
+                waitForRendering(notifications);
+                tryCompareFunction(function() { return notification1.expanded; }, true);
+                tryCompareFunction(function() { return notification2.expanded; }, undefined);
+            }
+
             function cleanupTestCase() {
                 notifications.hasMouse = false;
             }