on xenial help sign in
Reset topmostIsFullscreen to correctly rotate the shell when dismissing SIM PIN screen (LP: #1614070)

Approved by: Albert Astals Cid

commit21d06b09076cb272eeedd05403fe163481514edd authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 19 Aug 2016, 14:16 (10 years ago) parent9ffec52b8143da
6 files changed+104−9
qml/Notifications/Notification.qml+5−2 qml/Notifications/Notifications.qml+5−1 tests/mocks/Unity/Notifications/MockNotification.cpp+15 tests/mocks/Unity/Notifications/MockNotification.h+5 tests/qmltests/Notifications/Notification.qml+1 tests/qmltests/Notifications/tst_Notifications.qml+73−6
qml/Notifications/Notification.qml+5−2
@@ -37,7 +37,8 @@ StyledItem {
3737 property var hints
3838 property var notification
3939 property color color: theme.palette.normal.background
40− property bool fullscreen: false
40+ property bool fullscreen: notification.notification && typeof notification.notification.fullscreen != "undefined" ?
41+ notification.notification.fullscreen : false // fullscreen prop only exists in the mock
4142 property int maxHeight
4243 property int margins: units.gu(1)
4344
@@ -123,7 +124,9 @@ StyledItem {
123124 if (fullscreen) {
124125 notification.notification.urgency = Notification.Critical;
125126 }
126− ListView.view.topmostIsFullscreen = fullscreen;
127+ if (index == 0) {
128+ ListView.view.topmostIsFullscreen = fullscreen;
129+ }
127130 }
128131
129132 Behavior on implicitHeight {
qml/Notifications/Notifications.qml+5−1
@@ -69,7 +69,9 @@ ListView {
6969
7070 property int theIndex: index
7171 onTheIndexChanged: {
72− ListView.view.topmostIsFullscreen = fullscreen; // when we get pushed down by e.g. volume notification
72+ if (theIndex == 0) {
73+ ListView.view.topmostIsFullscreen = fullscreen; // when we get pushed down by e.g. volume notification
74+ }
7375 }
7476
7577 // make sure there's no opacity-difference between the several
@@ -78,6 +80,8 @@ ListView {
7880 //layer.enabled: add.running || remove.running || populate.running
7981 }
8082
83+ onCountChanged: if (count == 0) topmostIsFullscreen = false; // reset
84+
8185 // FIXME: disabled all transitions because of LP: #1354406 workaround
8286 /*populate: Transition {
8387 UbuntuNumberAnimation {
tests/mocks/Unity/Notifications/MockNotification.cpp+15
@@ -32,6 +32,7 @@ struct MockNotificationPrivate {
3232 QStringList actions;
3333 ActionModel* actionsModel;
3434 QVariantMap hints;
35+ bool fullscreen = false;
3536};
3637
3738MockNotification::MockNotification(QObject *parent) : QObject(parent), p(new MockNotificationPrivate()) {
@@ -181,3 +182,17 @@ void MockNotification::invokeAction(const QString &action) {
181182void MockNotification::close() {
182183 Q_EMIT completed(p->id);
183184}
185+
186+bool MockNotification::fullscreen() const
187+{
188+ return p->fullscreen;
189+}
190+
191+void MockNotification::setFullscreen(bool fullscreen)
192+{
193+ if (p->fullscreen == fullscreen)
194+ return;
195+
196+ p->fullscreen = fullscreen;
197+ Q_EMIT fullscreenChanged(fullscreen);
198+}
tests/mocks/Unity/Notifications/MockNotification.h+5
@@ -41,6 +41,7 @@ class MockNotification : public QObject {
4141 Q_PROPERTY(QStringList rawActions READ rawActions WRITE setActions)
4242 Q_PROPERTY(ActionModel* actions READ getActions NOTIFY actionsChanged)
4343 Q_PROPERTY(QVariantMap hints READ getHints WRITE setHints NOTIFY hintsChanged)
44+ Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged) // only in mock
4445
4546private:
4647 QScopedPointer<MockNotificationPrivate> p;
@@ -64,6 +65,8 @@ Q_SIGNALS:
6465 void completed(int nid);
6566 void actionInvoked(const QString &action);
6667
68+ void fullscreenChanged(bool fullscreen);
69+
6770public:
6871 MockNotification(QObject *parent=nullptr);
6972 virtual ~MockNotification();
@@ -87,6 +90,8 @@ public:
8790 void setActions(const QStringList &actions);
8891 QVariantMap getHints() const;
8992 void setHints(const QVariantMap& hints);
93+ bool fullscreen() const;
94+ void setFullscreen(bool fullscreen);
9095
9196 Q_INVOKABLE void invokeAction(const QString &action);
9297 Q_INVOKABLE void close();
tests/qmltests/Notifications/Notification.qml+1
@@ -28,4 +28,5 @@ Notification {
2828 secondaryIcon: ""
2929 value: 0
3030 rawActions: []
31+ fullscreen: false
3132}
tests/qmltests/Notifications/tst_Notifications.qml+73−6
@@ -141,6 +141,18 @@ Item {
141141 mockModel.append(n)
142142 }
143143
144+ function addFullscreenNotification() {
145+ var component = Qt.createComponent("Notification.qml")
146+ var n = component.createObject("notification", {"nid": index++,
147+ "type": Notification.SnapDecision,
148+ "hints": {"x-canonical-private-affirmative-tint": "true"},
149+ "summary": "SIM PIN screen",
150+ "body": "Enter your PIN to unlock the SIM",
151+ "fullscreen": true})
152+ n.completed.connect(mockModel.onCompleted)
153+ mockModel.append(n)
154+ }
155+
144156 function clearNotifications() {
145157 while(mockModel.count > 0) {
146158 remove1stNotification();
@@ -228,6 +240,12 @@ Item {
228240 onClicked: rootRow.add2ndConfirmationNotification()
229241 }
230242
243+ Button {
244+ width: parent.width
245+ text: "add a fullscreen notification"
246+ onClicked: rootRow.addFullscreenNotification()
247+ }
248+
231249 Button {
232250 width: parent.width
233251 text: "remove 1st notification"
@@ -371,6 +389,14 @@ Item {
371389 rawActions: ["ok_id", "Ok",
372390 "snooze_id", "Snooze",
373391 "view_id", "View"]
392+ },
393+ Notification {
394+ nid: 10
395+ type: Notification.SnapDecision
396+ hints: {"x-canonical-private-affirmative-tint": "true"}
397+ summary: "SIM PIN screen"
398+ body: "Enter your PIN to unlock the SIM"
399+ fullscreen: true
374400 }
375401 ]
376402
@@ -538,15 +564,12 @@ Item {
538564 signalName: "actionInvoked"
539565 }
540566
541− function init() {
542− while (mockModel.count > 0) {
543− mockModel.remove(0);
544− }
545− }
546−
547567 function cleanup() {
548568 clickThroughSpy.clear()
549569 actionSpy.clear()
570+ while (mockModel.count > 0) {
571+ mockModel.removeFirst();
572+ }
550573 }
551574
552575 function test_NotificationRenderer(data) {
@@ -797,6 +820,50 @@ Item {
797820 tryCompareFunction(function() { return notification2.expanded; }, undefined);
798821 }
799822
823+ function topmostIsFullscreen_data() {
824+ return [{
825+ tag: "Confirmation notification with value",
826+ n: nlist[6]
827+ },
828+ {
829+ tag: "SIM PIN fullscreen notification",
830+ n: nlist[9]
831+ },
832+ {
833+ tag: "Snap Decision without secondary icon and no button-tint",
834+ n: nlist[3]
835+ }]
836+ }
837+
838+ function test_topmostIsFullscreen() {
839+ var data = topmostIsFullscreen_data();
840+
841+ // fill the model
842+ data.forEach(function(notification) {
843+ mockModel.append(notification.n);
844+ notification.n.completed.connect(mockModel.onCompleted);
845+ })
846+
847+ // make sure the view is properly updated before going on
848+ notifications.forceLayout();
849+ waitForRendering(notifications);
850+
851+ // initially, topmost is not fullscreen
852+ verify(!notifications.topmostIsFullscreen)
853+
854+ // close the 1st one, 2nd one should be fullscreen
855+ var notification0 = findChild(notifications, "notification0")
856+ notification0.closeNotification();
857+ waitForRendering(notifications);
858+ verify(notifications.topmostIsFullscreen)
859+
860+ // close the 1st one (SIM PIN) again, topmost should no longer be fullscreen
861+ notification0 = findChild(notifications, "notification0")
862+ notification0.closeNotification();
863+ waitForRendering(notifications);
864+ verify(!notifications.topmostIsFullscreen)
865+ }
866+
800867 function cleanupTestCase() {
801868 notifications.hasMouse = false;
802869 }