Merge lp:~macslow/unity8/modal-snap-decision-on-greeter-fix-1378827 into lp:unity8

[Mirco Müller]

Also use modal nature of snap-decision notifications when greeter/lockscreen is shown. This fixes LP: #1378827.

Also use modal nature of snap-decision notifications when greeter/lockscreen is shown. This fixes LP: #1378827.

* 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?
Yes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4753/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1847
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7429
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15014

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

LGTM

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

 * Did CI run pass? If not, please explain why.
 No, usual autopilot problems

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

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-13 15:41:29 +0000
+++ qml/Shell.qml	2014-10-23 14:39:54 +0000
@@ -693,7 +693,7 @@
         Rectangle {
             id: modalNotificationBackground
 
-            visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
+            visible: notifications.useModal && (notifications.state == "narrow")
             color: "#000000"
             anchors.fill: parent
             opacity: 0.9

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-08-21 14:12:27 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-10-23 14:39:54 +0000
@@ -248,7 +248,7 @@
         self.assert_notification_action_id_was_called("action_accept")
 
     def test_modal_sd_without_greeter(self):
-        """Snap-decision should block input to shell without greeter."""
+        """Snap-decision should block input to shell without greeter/lockscreen."""
         unity_proxy = self.launch_unity()
         unlock_unity(unity_proxy)
 
@@ -295,7 +295,7 @@
         self.assert_notification_action_id_was_called("action_accept")
 
     def test_modal_sd_with_greeter(self):
-        """A snap-decision should not block input to the greeter beneath it."""
+        """A snap-decision should block input to the greeter/lockscreen beneath it."""
         self.launch_unity()
 
         summary = "Incoming file"
@@ -322,11 +322,12 @@
             hints
         )
 
-        # verify that we can swipe away the greeter (interact with the "shell")
+        # verify that we cannot reveal the launcher (no longer interact with
+        # the shell)
         time.sleep(1)
         self.main_window.show_dash_swiping()
-        greeter = self.main_window.get_greeter()
-        self.assertThat(greeter.shown, Eventually(Equals(False)))
+        self.assertThat(
+            self.main_window.is_launcher_open, Eventually(Equals(False)))
 
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()